Commit Graph
37 Commits
Author SHA1 Message Date
gigglewang0417 2f60dd6ca5 fix(ci): switch session back to primaryWsId after provision
provisionApps processes ws2-workflow.yml last (EE mode), which calls
POST /workspaces/switch to secondaryWsId. The bearer token session then
has current_workspace = auto_test1.

Suite jobs sharing the same token inherit this state. When they call
describe?workspace_id=auto_test0 for hitl apps, the server returns 422:
'workspace_id does not match app's workspace'.

Fix: after provisionApps, switch back to primaryWsId so all subsequent
suite jobs start with the correct workspace context.
2026-06-08 13:57:57 +08:00
gigglewang0417 0d66bbefc3 test(e2e): remove config suite (feature not yet implemented) 2026-06-08 10:41:04 +08:00
gigglewang0417 fe91ccfe5d fix(ci): use DIFY_E2E_INCLUDE env to override vitest include list per job
Previously, passing positional file args to pnpm test:e2e had no effect
because vitest.e2e.config.ts include list took precedence, causing every
parallel job to run the full suite and hit the 20-minute timeout.

vitest.e2e.config.ts:
- Add DIFY_E2E_INCLUDE env var (comma-separated globs, replaces SINGLE_FILE)
- DIFY_E2E_SINGLE_FILE kept as deprecated alias for back-compat
- When set, include list is built from DIFY_E2E_INCLUDE instead of the
  hardcoded full-suite list

cli-e2e.yml:
- Every suite job now sets DIFY_E2E_INCLUDE to target its own files
- Remove positional file args (they were silently ignored by vitest config)
- Standardise smoke filter: FILTER_ARGS array -> inline -t arg
- timeout-minutes: discovery 20->15, run/* 20->35 (CI ~5x slower)
2026-06-08 10:32:06 +08:00
gigglewang0417 56ba8f421a ci(cli-e2e): parallel job workflow + provision script + test fixes
Workflow (cli-e2e.yml):
- Plan B: split into parallel jobs after a shared provision step
- provision job: mints token + provisions DSL apps, outputs IDs to downstream jobs
- suite-run: matrix of 5 parallel jobs (basic/streaming/conversation/file/hitl)
- suite-last: serial, waits for all parallel jobs; runs use/devices/logout/agent
- Add DIFY_E2E_NO_KEYRING=1 globally (Linux CI has no keychain)
- timeout-minutes: 30 → 60; smoke filter: --testNamePattern → -t

New script (cli/scripts/e2e-provision.ts):
- Standalone Bun script: login + mint token + discover workspaces + provision apps
- Outputs to GITHUB_OUTPUT + .provision-output.json

Test fixes:
- run-app-streaming: DIFY_E2E_NO_KEYRING=1 in spawn-based tests
- run-app-basic: fix cache test (DIFY_CACHE_DIR + app-info.yml path)
- run-app-conversation/file: SSO injectAuth uses new hosts.yml format
- get-app-list: tag filter auto-provisions e2e-test tag
- vitest.e2e.config.ts: DIFY_E2E_SINGLE_FILE override + agent suite
2026-06-07 16:35:31 +08:00
gigglewang0417 3133b196ad Merge remote-tracking branch 'origin/main' into feat/cli-e2e-test-suite
# Conflicts:
#	cli/.gitignore
2026-06-04 17:48:38 +08:00
gigglewang0417 3cc20de830 test(cli-e2e): add full e2e suite — auth/config/discovery/run/output/error-handling/framework/help
New suites:
- auth/login.e2e.ts
- config/config-init.e2e.ts, config-rw.e2e.ts
- error-handling/error-messages.e2e.ts, exit-codes.e2e.ts
- framework/global-flags.e2e.ts, help.e2e.ts
- output/json-yaml-output.e2e.ts, table-output.e2e.ts

Updated suites:
- auth: devices / logout / status / use / whoami
- discovery: describe-app / get-app-all-workspaces / get-app-list / get-app-single
- run: run-app-basic / conversation / file / hitl / streaming

Infra:
- fixtures/apps: 9 DSL files for app provisioning
- setup/global-setup.ts: multi-token provisioning + workspace discovery
- setup/env.ts: capability injection
- helpers/skip.ts: conditional skip helper
- vitest.e2e.config.ts: include help.e2e.ts in both local and staging modes
2026-06-04 17:47:13 +08:00
f0fd7ddb60 feat(cli): unified help system (#36896)
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-06-04 07:27:28 +00:00
Yunlu WenandGitHub f19679b217 refactor: improve network error and allow verbose output (#36923) 2026-06-02 10:43:40 +00:00
Xiyuan ChenandGitHub 6ce61eae59 fix(cli): invalidate app metadata cache on 422 to clear stale data (#36921) 2026-06-02 05:20:33 +00:00
Xiyuan ChenandGitHub 0da13dfe4d refactor(cli): unify token storage behind Store + add host/account switching (#36830) 2026-06-02 04:05:53 +00:00
gigglewang0417 363aabee73 ci(cli-e2e): auto-retry failed tests via VITEST_RETRY=2
vitest.e2e.config.ts:
  Read VITEST_RETRY env var (default 0) to set the global retry count.
  Local runs keep retry=0; per-test withRetry() stays the precise tool
  for known flaky paths. CI sets retry=2 to handle transient server 500s.

cli-e2e.yml:
  Pass VITEST_RETRY=2 to the test step so each failing test gets up to
  2 automatic retries before being reported as a failure.
2026-06-02 10:14:07 +08:00
gigglewang0417 e61073ccd5 fix(cli): mkdir before lockSync to prevent ENOENT on fresh CI runners
On a fresh GitHub Actions runner /home/runner/.cache/difyctl/ does not
exist yet. lockfile.lockSync() opens/creates the .lock file but does
not create the parent directory, causing ENOENT and failing every test
that touches the app-info cache.

Add fs.mkdirSync({ recursive: true }) in FileBasedStore.lock() — the
same guard that flush() already has — so the cache directory is always
present before the lock is acquired.
2026-06-02 10:01:37 +08:00
gigglewang0417 d9b928577c test(cli-e2e): expand Discovery (Issue 3) and HITL (4.5) test suites
Discovery (Issue 3):
- get-app-list: add 11 new cases (sorted order, JSON fields, --limit 100,
  --name/--tag filters, pipe, network error); adjust 3 cases (merge
  duplicate unauth tests, split --mode unknown/chatbot, fix SSO to use
  real token + itWithSso)
- get-app-single: add 12 new cases covering full success path (-o json/yaml/
  name/wide, pipe, -w workspace, network error, special chars); merge 4
  duplicate unauth/SSO cases; fix SSO to use itWithSso
- describe-app: add 9 new cases (Description, Author, Inputs schema fields
  3.70-3.75, network error 3.88); adjust 5 cases (merge duplicates,
  strengthen assertions, fix SSO, add assertNoAnsi to pipe test)
- get-app-all-workspaces: add 6 new cases (-o wide WORKSPACE column, sort,
  workspace_id per app, network error, -w stability); merge 4 duplicate
  unauth/SSO cases; fix itWithSso guard; correct WORKSPACE column to -o wide

HITL (Issue 4.5):
- add 5 new cases: streaming pause (4.5.7), consumed token (4.5.16),
  --inputs-file (4.5.12), --with-history (4.5.14), resume --stream (4.5.17)
- strengthen 4 existing cases: full JSON fields, hint with form_token,
  --action + --inputs, workflow_finished assertion
2026-06-01 17:38:39 +08:00
cfc1cf2b8c refactor(cli/http): replace ky with a self-contained HTTP client (#36711)
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-06-01 09:04:42 +00:00
Yunlu WenandGitHub 400befc451 Merge branch 'main' into feat/cli-e2e-test-suite 2026-06-01 15:22:42 +08:00
gigglewang0417 4649e52384 fix(cli-e2e): use @ts-expect-error to suppress TS2345 for inject/provide
Both augmentation approaches fail under tsgo in the Main CI pipeline:
  - 'vitest' augmentation → TS2300 (re-exported ProvidedContext in @0.1.22)
  - '@voidzero-dev/vite-plus-test' augmentation → TS2664 (module not found;
    tsgo scans cli/ tree but cannot resolve pnpm virtual-store symlinks)

Use @ts-expect-error at the three call sites (global-setup, devices, logout)
as the only option that satisfies both tsgo and the ESLint ban-ts-comment
rule (which requires @ts-expect-error over @ts-ignore).
2026-06-01 15:22:17 +08:00
gigglewang0417 c045e0b635 fix(cli-e2e): fix ProvidedContext augmentation for vite-plus-test@0.1.22
Root cause: keyof ProvidedContext = never in @0.1.22 because the interface
is empty. inject() / project.provide() have T extends keyof ProvidedContext,
so any string literal — including 'as any' casts — is TS2345 under tsgo
which scans the whole cli/ tree (not just the src/ include in tsconfig.json).

Fix: augment '@voidzero-dev/vite-plus-test' directly (where ProvidedContext
is defined as an empty interface meant for user extension via declaration
merging) instead of 'vitest'. This avoids TS2300 duplicate identifier in
@0.1.22 and restores full type safety for inject/provide without any cast.

Revert all previous workaround casts ('as any', 'as unknown as') now that
the augmentation path is correct.
2026-06-01 15:14:17 +08:00
gigglewang0417 cf7859cbf9 fix(cli-e2e): fix 4 smoke test failures on console-platform-dev
run-app-basic:
  Widen stderr pattern for non-existent app test — new env returns
  'server_5xx: Internal Server Error' (HTTP 500) instead of 404/not-found.

describe-app:
  Wrap ANSI colour test with withRetry(3) to handle transient 500s on
  cold-start against console-platform-dev.

run-app-streaming:
  Workflow streaming test was passing only x='wf-stream-val'; the workflow
  app requires num, enum_var and paragraph as required fields too.
  Add all four required inputs to the --inputs payload.

cli.ts (mintFreshToken):
  Increase console/api/login timeout from 10s to 20s — the dev environment
  was timing out during the devices revoke test on CI.
2026-06-01 15:01:14 +08:00
gigglewang0417 81d2c1638f fix(cli-e2e): cast inject/provide keys to satisfy vite-plus-test@0.1.22
In @0.1.22 ProvidedContext is an empty interface with no augmentation path
that avoids TS2345 (keyof ProvidedContext = never). Cast the string keys
with 'as any' (suppressed via eslint-disable) at each call site so both
project.provide() and inject() compile cleanly without module augmentation.
2026-06-01 14:43:12 +08:00
gigglewang0417 69923a16e1 fix(cli-e2e): remove ProvidedContext augmentation to fix TS2300 on CI
vite-plus-test@0.1.22 exports ProvidedContext from its own module, making
any 'declare module vitest { ProvidedContext }' augmentation produce a
TS2300 duplicate identifier error and collapse the type to 'never'.

Fix: remove the module augmentation from vitest-context.ts entirely.
Callers (devices.e2e.ts, logout.e2e.ts) now cast inject() results with
'as E2ECapabilities' directly at the call site — no global type magic needed.
2026-06-01 14:37:41 +08:00
gigglewang0417 7114415cfd fix(cli-e2e): fix TS errors caused by vite-plus-test@0.1.22 upgrade
skip.ts:
  - Return SuiteAPI/TestAPI with 'as unknown as' cast to bridge the
    ChainableSuiteAPI incompatibility across vite-plus-test versions
    (TS2322 / TS4058). Uses unknown intermediate to satisfy no-explicit-any.

vitest-context.ts:
  - Change 'export type ProvidedContext' to 'interface ProvidedContext'
    augmentation to avoid TS2300 duplicate identifier now that
    vite-plus-test@0.1.22 re-exports ProvidedContext from its own module.
2026-06-01 14:32:24 +08:00
gigglewang0417 6c8ec0b1c8 fix(cli-e2e): add explicit return types to optionalDescribe/optionalIt
TS4058: exported functions in skip.ts return vitest-internal types that
cannot be named by the CI type-checker (vite-plus-test@0.1.22).
Annotate with 'typeof describe' and 'typeof it' — both are stable,
publicly addressable types — to satisfy the type-check pipeline.
2026-06-01 14:23:22 +08:00
yyhandGitHub a8a2ca7b98 chore(cli): move eslint config into cli package (#36878) 2026-06-01 03:54:14 +00:00
c0ee821d45 refactor: use absolute path for inter dir importing (#36822)
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
2026-06-01 01:32:16 +00:00
Yunlu WenandGitHub b6f92f1dc4 fix(cli): fix style (#36821) 2026-05-29 08:34:36 +00:00
Yunlu WenandGitHub 5070cc9668 refactor(cli): optimize error handling in flag parsing (#36810) 2026-05-29 07:39:26 +00:00
Xiyuan ChenandGitHub 30270b5c30 fix(device): surface SSO errors on /device and fix CLI null-account crash on external-SSO login (#36781) 2026-05-29 06:51:34 +00:00
zyssyz123GitHubautofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2cc567c6a3 feat: add DTO for agent api (#36797)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-29 03:36:41 +00:00
gigglewang0417 5ff98b97df test(cli-e2e): add .env.e2e.example, remove empty .env.e2e.local
- Add .env.e2e.example as a template listing all required and optional
  DIFY_E2E_* variables with empty values — safe to commit, helps new
  contributors set up their local environment quickly.
- Remove .env.e2e.local (was a 0-byte placeholder with no practical use).
2026-05-28 18:26:21 +08:00
gigglewang0417 982ada6f4e test(cli-e2e): remove oversized file upload test case (4.4.12)
Current dev environment (console-platform-dev.dify.dev) has no enforced
file size limit, so the 20 MB upload completes successfully instead of
returning an error, causing the test to time out rather than fail cleanly.
Remove until a fixture with a known size cap is available.
2026-05-28 18:23:09 +08:00
gigglewang0417 e0d5bc48d9 test(cli): expand e2e suite 2026-05-28 18:13:30 +08:00
Yunlu WenandGitHub 3596d12e4c refactor(cli): use Store interface as token storage (#36726) 2026-05-28 10:02:51 +00:00
gigglewang0417 bc3b1c0c81 fix(ci): fix pnpm version conflict in cli-e2e workflow; refine e2e suite
- Override pnpm to v11 (packageManager field) before CLI install step to
  resolve ERR_PNPM_BAD_PM_VERSION conflict with setup-web's pnpm@9
- Add per-suite dedicated tokens (logoutToken / devicesToken) in global-setup
  via device flow to prevent token cross-contamination between suites
- Translate all Chinese comments and test names to English across e2e suites
- Fix injectAuth: add tokenId field so devices revoke correctly detects selfHit
- Fix HITL test: read action id dynamically from pause response instead of
  hardcoding 'submit'
2026-05-27 17:23:46 +08:00
Yunlu WenandGitHub a8d380bcaf refactor(cli): add kvstore and platform interface (#36687) 2026-05-27 05:30:12 +00:00
L1nSn0wGitHubClaude Opus 4.7autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
6e1e0d9439 feat(openapi,cli): workspace switch + member management (#36651)
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-27 03:05:47 +00:00
gigglewang0417 5646bda88e test(e2e): add E2E test suite for CLI v1.0
Covers auth, config, run, and CLI framework scenarios against a live
staging server using vitest + real difyctl binary.

Suite layout:
  test/e2e/
  ├── helpers/
  │   ├── cli.ts          — run(), withAuthFixture(), mintFreshToken()
  │   ├── assert.ts       — assertExitCode, assertJson, assertErrorEnvelope
  │   ├── cleanup-registry.ts — staging data teardown
  │   └── retry.ts        — withRetry() for flaky network assertions
  ├── setup/
  │   ├── global-setup.ts — health-check, disposable token mint
  │   └── global-teardown.ts — conversation cleanup
  └── suites/
      ├── auth/           — status, use, whoami, devices, logout
      ├── config/         — path, get/set/unset/view, env override
      └── run/            — basic, streaming, conversation, file, HITL

Key design decisions:
- Each test uses an isolated temp configDir via withAuthFixture()
- Logout and devices-revoke tests run last to avoid invalidating
  the shared E.token used by all other suites
- mintFreshToken() mints a disposable dfoa_ token on demand via the
  device flow API so revoke tests never touch the primary session
- Global retry is 0; flaky network calls use withRetry() locally
- test:e2e:smoke script filters to [P0] cases via testNamePattern

package.json: add test:e2e / test:e2e:smoke / test:e2e:local scripts
.gitignore: exclude .env.e2e, oclif.manifest.json, tmp/
.env.e2e.example: credential template for local setup
2026-05-27 10:07:28 +08:00
Yunlu WenGitHubGareArcCopilot Autofix powered by AIautofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>L1nSn0wClaude Opus 4.7gigglewangCopilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>Xiyuan Chen
a728e0ac69 feat: adding dify cli (#36348)
Co-authored-by: GareArc <garethcxy@dify.ai>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: L1nSn0w <l1nsn0w@qq.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: gigglewang <gigglewang@dify.ai>
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Co-authored-by: Xiyuan Chen <52963600+GareArc@users.noreply.github.com>
2026-05-26 01:12:36 +00:00