dsh-cindy-host 0.1.32 → 0.1.34

package/CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## 0.1.34 — 2026-11-05
+
+- Project durable native failed turns as stable, sanitized error rows and terminal maker events in both cold history and live delivery. Preserve native failure/retry ownership, expose only fixed known-code messages and validated HTTP status, and repair reconnect state without stopping newer turns or leaking provider diagnostics.
+
+- Register user questions before either surface displays them, including sessions a phone has never visited. Replay the existing pending cards on session subscribe/reconnect; keep them through temporary relay recovery and remove the hidden Host question timeout, without changing permission ownership/deadlines.
+- Settle local and phone answers through the same pending completion; preserve native cancellation/timeout errors and clear both cards on task stop instead of returning empty/undefined answers. Keep the existing Cindy protocol and DSH native UI. Add focused Host regressions and opt-in tests against installed Cordis/userQuestions/Gateway; these are not live-handset acceptance or a production deployment.
+
+## 0.1.33 — 2026-11-04
+
+- Add authorized current-surface reference-source history through native observations, real message identities, filters/cursors and explicit clipping metadata. Keep frozen target-reference capability false and reject structured contexts before every admission/edit/preparation/replay boundary; do not disguise source reads or plain links as target consumption.
+
+- Adapt the existing sidebar custom-order calls to native registered Workspaces and insertBefore, with verified account/device/source stamps, all-key prevalidation, serial native moves and truthful partial/concurrent failure snapshots. Refuse activity and cross-device/unregistered/ambiguous variants; do not create another order store.
+
+- Adapt existing-dialogue recurring reminder CRUD to the native schedule owner with complete-record update CAS, strict execution-field refusals, genuine one-time read/delete and known-created-ID recovery. Forward only committed ready notifications with authorized peer-lifetime cleanup; do not fabricate pause, run history, cost, completion or notifications. Cover the slice with focused Host tests only.
+
+- Adapt the three existing subagent read endpoints to native parent/descendant catalogs, actual consumed-work/live-state evidence and private-context-safe child-owned transcripts. Keep all controls and unproved returned-result capability false; add signed 25-entry/byte-bounded continuation/tail paging and Host-only focused tests. Consume the SDK work reader as a host-provided peer, without installing core/profile packages.
+
+- Add provider-backed Mainland/Global settings-page login: Apple/other enabled social providers, enterprise SSO, regional discovery/confirmation, code delivery, account selection, required binding and SSO verification. Use official endpoint manifests, hosted callback/PKCE/poll-secret or configured loopback fallback; keep all authentication tickets and tokens backend-only. CAPTCHA uses the official challenge page with an explicitly manual successful-URL return in a normal browser.
+- Fence login, cancellation, logout and refresh on the serialized encrypted-credential owner; reject stale UI steps and cross-origin/non-JSON mutations. Rebuild an immutable regional connection context so device-link, media and ICE cannot receive another region's credentials. Include isolated protocol, HTTP, actual local callback, UI state and runtime URL regressions. These regressions do not establish real Apple/enterprise login or iOS acceptance.
+
+- Adapt the official background-task roster to the native owner-fenced jobs registry and reuse native control frames for real task-status updates. Keep stopping nonterminal, omit unknown continuation claims, and never consume output, invent a file/provider/tool origin, or expose fictional stop/output channels. Cover Host owner/state mapping and stale-frame/source teardown fences with focused tests.
+
+- Serve native literal keyword search with real current-message identities/counts, all accepted filters/sorts, genuine limits over 20, bounded scans and cancellation. Refuse explicit semantic/hybrid requests without an enabled native backend; do not pretend global FTS is mounted. Add focused Host protocol field-mapping tests using the official schema as a read-only reference.
+
+- Adapt ordinary fork using committed message identities and exact native user-before/completed-assistant-turn cuts. Return the real child row, publish the existing created event, and retain child IDs across attachment/discovery/source failures without automatically creating another child. Unsupported branch/rewind/encrypted variants stay refused.
+
+- Serve the existing compact-session channel using verified native scoped DSH commands, with strict instructions refusal, real no-op/error results, in-process duplicate-envelope protection, stop/disconnect cancellation, and history invalidation. The Claude queue-compaction protocol is not treated as an alias.
+
+- Wire pin/unpin metadata to the native DSH workspace registry, with membership-only stable wire projection, committed desktop-to-controller refresh, idempotent retries, legacy-overlay retirement, and pre-write mixed-operation validation. No Cindy protocol extension or native timestamp/order claim.
+
+- Fix mobile thinking visibility: send structured `{ text }` content instead of the prose string the mobile normalizer silently drops. Keep ordinary user/assistant prose unchanged.
+- Forward public DSH reasoning chunks during generation, coalesce native thinking pushes, expose the active prefix through history/work details, and retire temporary rows when the durable or interrupted assistant message arrives. Do not transmit private replay metadata or count previews as durable activity.
+- Add regression coverage for the real pinned mobile thinking normalizer, cold/live history, preview retirement, cancellation, routing and teardown. Package/runtime checks are not live-handset acceptance.
+- Route native archive, reminder and project-order event subscriptions through the Host-owned guarded boundary, and pin native replacement fixtures to the real SDK `startSeq`/`endSeq` contract. Synchronize the development lock on the verified 0.2.1-rc.5 carrier while preserving the declared peer compatibility range.
+- Improve the read-only channel audit for imported scalar constants, generic/double-quoted call sites and independent mobile consumers. Explicitly document actual refusals of optional controlled-model catalog, usage widget, machine status and unmapped migration/cloud/provider protocols; this does not enable those features or certify all new Cindy protocols.
+
 ## 0.1.32 — 2026-11-03
 
 - Remove keytar and its native npm build chain. Linux/macOS keep system credential vaults through secret-tool/security; Windows encrypts with built-in DPAPI CurrentUser and persists ciphertext through the native DSH credential record service. Login, renewal and logout share one installation-scoped store; failures never fall back to plaintext or pretend a stored login is absent. Windows upgrades may require one explicit login; legacy vault entries are left untouched.

package/README.md

@@ -4,10 +4,12 @@ A Host-side adapter connecting current Cindy clients to DeepSeek Harness.
 
 ## Requirements and installation
 
-Version **0.1.32** additionally supports **DSH 0.2.2-alpha.2**, while retaining `0.2.1-rc.3`, `0.2.1-rc.4` and `0.2.1-rc.5`. Alpha requires **Node.js >=24.9** (tested with 24.12); the older carriers retain this plugin's Node.js >=22.16 minimum. Session/settings peers and alpha Schemastery are explicitly allowed, not a blanket promise for future prereleases. Install through the Desktop DSH plugin manager. CLI-managed profiles can use:
+Version **0.1.34** improves native/phone question synchronization and cancellation, and safely displays durable model/turn failures. It retains 0.1.33's regional authentication UI, public reasoning streaming and native capability subsets.
+
+It supports the exact **DSH 0.2.2-alpha.2** carrier, while retaining `0.2.1-rc.3`, `0.2.1-rc.4` and `0.2.1-rc.5`. Alpha requires **Node.js >=24.9** (tested with 24.12); the older carriers retain this plugin's Node.js >=22.16 minimum. Agent/session/settings peers and alpha Schemastery are explicitly allowed, not a blanket promise for future prereleases. The full Web installation gate uses DSH **0.2.1-rc.5**; alpha core-contract checks do not establish alpha Web/relay/handset acceptance. Install through the Desktop DSH plugin manager. CLI-managed profiles can use:
 
 ```sh
-dsh plugin --profile <profile> add dsh-cindy-host@0.1.32
+dsh plugin --profile <profile> add dsh-cindy-host@0.1.34
 ```
 
 Reload the Host plugin after installation. A full DSH restart is separate. Keep existing Cindy sign-in, device identity and settings; do not run two Host processes with the same identity.
@@ -79,6 +81,38 @@ The ledger lives under the active DSH profile state directory. Pending payloads
 
 All changes are Host-only: no Cindy or DSH core patch is required. The handshake compatibility stamp is separate from the actual plugin version and explicit v1 capability. Unsupported optional features are refused; this is not a promise of all native Cindy features or exactly-once external tool effects.
 
+## Apple, enterprise SSO and regional login (0.1.33)
+
+In **Settings → Cindy 手机连接**, choose the same **Mainland China / Global** account region as the phone, then load sign-in options. The Host discovers enabled providers from that region: Apple/social browser authorization, phone/email codes and enterprise SSO follow Cindy's official protocol. Provider availability is server-controlled; the same Apple ID does not merge accounts across regions. The browser opens the official Cindy authorization page; return to DSH for membership selection, required contact binding or extra SSO verification. Secrets and tickets stay in the Host, not settings or browser storage.
+
+Organization ID/slug/domain and email discovery check both regions. A found organization in the other region requires explicit confirmation; ambiguous or partly failed discovery never silently picks a region. Cancel/start-over fences late browser, code and vault-write results. Login while the phone-connection switch is off saves only; it does not enable transport. Account/region changes rebuild the whole runtime so relay, device directory, media staging and ICE remain in the credential's region. Existing encrypted credentials are preserved; failures never erase them.
+
+**CAPTCHA browser limitation:** when a region requires it for code delivery, open the official verification page, solve it, then copy its complete successful URL (including `#cindy-captcha=ok.…`) into the DSH form. The standard browser cannot read the cross-origin result automatically. The verification proof is sensitive and short-lived: do not share it. The Host validates its official origin and forwards only the proof to the requested auth action; it does not bypass verification or proxy/inject the challenge page. Apple/SSO browser authorization does not use this manual code-delivery step.
+
+This feature ships in 0.1.33; installation and runtime activation are verified separately. Tests cover protocol, real local callbacks, settings-panel state, credential races and both regions' actual runtime URL routing with fake credentials. Real Apple/enterprise identity providers and iOS discovery/file round trips still require an authorized test account after deployment. See [authentication flow notes](doc/auth-login.md). The new browser flow is exposed by the settings page; the older interactive CLI is not a replacement for that UI on Windows.
+
+## Thinking content on Cindy mobile (0.1.33)
+
+The Host sends DSH-provided public reasoning text/summaries as native structured `thinking` content (`{ text }`), not ordinary prose strings. Expand the work/activity group, then its thinking row, to read it. No Cindy or DSH core patch is needed. Models that expose no reasoning text still have nothing to show; signatures and provider-private replay metadata are never forwarded.
+
+During generation, `assistant/chunk` reasoning deltas are displayed as temporary thinking rows. Pushes coalesce over 100 ms; the work-grouped history uses the existing coalesced view refresh. Opening a session mid-generation reconstructs the current prefix from the log. The final assistant message replaces the preview, including interrupted prefixes, without duplicating it. Temporary rows do not become durable message-count/grouping evidence, and timers are cleared on Host disconnect.
+
+This ships in 0.1.33; handset acceptance is separate from package checks and local Host activation. Offline regressions execute the pinned real Cindy mobile thinking normalizer; live phone/network acceptance remains separate.
+
+## Questions on DSH and Cindy
+
+While the Host bridge is enabled, questions are registered before presentation, even if no phone has opened that session. DSH's native question UI and the existing Cindy card can both answer; the first accepted answer settles the shared pending entry and dismisses the other surface. Session open/reconnect replays pending cards with the same request IDs. Temporary relay loss does not cancel questions.
+
+Questions have no extra Host timeout. The caller's stop/cancel and DSH's own timed-question lifecycle still apply; explicit Host switch-off/unload cancels outstanding bridge waits. Permission cards retain their existing ownership and deadline. No Cindy/DSH patch or phone protocol upgrade is needed. This does not add cross-process recovery or mobile late-answer support after DSH has continued a timed call.
+
+Run the focused regressions with:
+
+```sh
+node --test test/user-question-bridge.test.js test/host-approvals.test.js test/dsh-plugin.test.js
+```
+
+The opt-in installed-runtime suite additionally exercises real Cordis, userQuestions and Gateway event delivery/replay/cancellation. Point `DSH_TEST_NATIVE_MODULES` at a built DSH node_modules directory, then run `node --test --test-isolation=none test/user-question-native.test.js`. For an Electron asar installation use the installed executable with `ELECTRON_RUN_AS_NODE=1`. These checks use isolated contexts and do not reload the running GUI; real-handset acceptance is separate.
+
 ## Model switching follows DSH
 
 When native `sessionController.selectModel` is composed, the Host tells Cindy to delegate model-window decisions to DSH. Users may select another model during a running turn and select the original model again. DSH validates the provider/model/effort and records the selection for the **next model request**; an already-issued request is not interrupted. DSH owns context preparation and compaction, not Cindy's legacy 90%-window precheck or a Host-side summary/rebuild implementation.
@@ -89,7 +123,67 @@ Missing capacity metadata is not a Host-side veto. Native DSH refusals still pro
 
 Controller archive/restore metadata now calls the same durable `workspaceRegistry.archiveSession` / `unarchiveSession` operations as DSH itself. Lists, exact reads and activity badges fold the native archive set; committed desktop changes invalidate controller lists and publish row patches. Archiving drops the pin without deleting history or changing workspace membership.
 
-The existing archive gesture does not request `stopActivity`, so DSH refuses sessions with running work; stop the work explicitly before archiving. Missing native archive services and storage failures are not downgraded to local-only success. Old controller-only archive flags remain visible until an explicit archive/restore retires that session's flag; upgrades do not bulk-archive native sessions. Delete remains a controller-only hide, and pin timestamps remain Host metadata.
+The existing archive gesture does not request `stopActivity`, so DSH refuses sessions with running work; stop the work explicitly before archiving. Missing native archive services and storage failures are not downgraded to local-only success. Old controller-only archive flags remain visible until an explicit archive/restore retires that session's flag; upgrades do not bulk-archive native sessions. Delete remains a controller-only hide. Native pin membership is now projected separately as described below.
+
+## Native DSH pin membership
+
+Pin/unpin writes use native `workspaceRegistry.pinSession` / `unpinSession`; native desktop changes refresh controller lists and row patches. Repeating a pin does not reorder native pins. Archiving clears the native pin, and hidden/archived sessions cannot be newly pinned. Missing native pin APIs or persistence failures never become local-only success.
+
+DSH exposes an ordered ID set, not pin timestamps. The existing Cindy wire field therefore uses the fixed `1970-01-01T00:00:00.000Z` membership sentinel, **not** a claimed native timestamp or exact manual pin order. Legacy local pin flags remain readable until an explicit operation or corresponding native commit retires them; no automatic bulk migration occurs. Mixed rename/status/pin writes that native APIs cannot commit atomically are rejected before any side effect.
+
+## Native manual compaction subset
+
+`maker:compact-session` executes the target ordinary Agent's verified native scoped `/compact` command through `commands.execute`, not a text prompt or a Host summary engine. Only omitted or whitespace-only instructions are supported; nonempty instructions and the separate Claude queue-compaction protocol remain explicitly unsupported. Missing services/preset commands, busy maintenance and native errors never become successful no-ops. Benign no-history success maps to `{ noop: true }`; no native token counts are invented.
+
+The existing 11-minute Cindy timeout applies. The Host waits for the real command result, invalidates transcript/history reads after success or failure, and forwards source/link teardown or an accepted stop to the native cancellation signal. Cancellation is not a rollback guarantee. Repeated copies of the same envelope share an in-process bounded receipt, not a cross-restart exactly-once promise; new request identities are not automatically replayed.
+
+## Ordinary native fork subset
+
+`maker:fork(sourceSessionId, messageClientId)` locates the actual committed row using the shared message fold and one leased native observation. A human user point copies the prefix before that prompt; an assistant point includes its entire completed turn. DSH alone creates the child and selects its inherited cwd/preset/default model behavior. The source is not rewound or edited. The Host reads the real new row and emits the existing created notification.
+
+Unknown, ambiguous, shadowed, incomplete/aborted-turn, first-user-without-prior-assistant and unsafe mid-tool steering cuts are refused. Native history is bounded at 100,000 events; encrypted-stripping forks, branch navigation and in-place rewind remain unsupported. A known created child ID is retained and reported if Workspace attachment, discovery or source teardown fails; such a failure must not automatically trigger another fork. Native fork has no caller cancellation or durable idempotency key: duplicate envelopes are deduped only in-process, and disconnection is not a rollback guarantee.
+
+## Native literal keyword search
+
+The existing conversation-search channel uses the mounted native `sessionQuery.filterEvents` literal-text/current-surface API, even when global FTS is disabled. It searches only Host-visible ordinary sessions without waking an Agent, preserves real message/client identities and counts, and applies every accepted status/archive, display-agent alias, activity, ID and grouped-working-directory filter. Title matching uses the same unnamed-label string as Cindy. Relevance is deterministic keyword ranking, not a claimed native FTS/vector score.
+
+Keyword mode (also the Host default when omitted) returns `vectorUsed:false` with an explicit literal-only diagnostic; explicit hybrid requests are refused. Limits up to 200, including values over 20, are honored; larger limits and unknown fields refuse rather than silently narrowing. A scan has bounded candidates/events/text/time/concurrency/response size; exhausted budgets report `poolCapped:true`, while storage/read errors stay errors. Late cancelled reads are discarded and observation leases released. Up to three real message previews accompany a result. Host-only focused tests assert the request/response fields against the read-only official protocol reference.
+
+## Native background jobs: read-only subset
+
+The existing session-background-task list reads native `jobs.list(sessionId)`, the same public, owner-fenced registry operation used by DSH's job-controller roster stream. It includes that ordinary session's own and unowned active jobs, not other sessions' jobs, and never activates an Agent. Native `stopping` remains running (and is labelled stopping); terminal states are sent only from real native status evidence through existing `agent_task_update` events. Unknown/malformed/over-budget rosters refuse instead of becoming empty success.
+
+Cindy roster snapshots contain active tasks only. The optional `pendingContinuations` is omitted as unknown, never fabricated as zero. Native IDs receive stable job namespaces; titles identify DSH. No vendor provider, originating tool-call, output file, model token use or completion is invented. Status pushes reuse the source-owned DSH control stream with visibility/generation checks and bounded transient deduplication; no extra per-phone job stream or consuming output cursor is opened.
+
+Precise stop and output-tail channels are not in the verified official remote protocol and are not added. The native DSH kill/follow APIs remain DSH features, not newly exposed Cindy controls; ordinary input-stop retains its existing meaning. These are source/offline-contract changes, not a production reload or handset acceptance claim.
+
+## Native durable children: read-only subset
+
+The three existing subagent-run list/detail/transcript endpoints recheck an ordinary parent and its native durable child catalog on every request. Native descendant traversal is used when composed; disconnected/cyclic relations, external children and unknown/corrupt branches refuse explicitly rather than disappearing or becoming completed. No arbitrary session lookup or Agent resolution is used to grant access. Stable run IDs bind parent and native child IDs; the existing pi provider value is only a transport alias, with DSH clearly named in the title/description.
+
+Run status uses the real live-Agent lookup, registered native inbox view and host-provided public `foldConsumedWork` reader. Inactive does not mean completed; queued/unknown/unaccounted work is not presented as terminal success. The SDK package is a peer, never a private installed dependency graph. Missing services/helpers refuse dynamically. Resume, steer and stop stay false; returned-result capability stays false because a last assistant message is not evidence of delivery to the parent.
+
+History includes only the child-owned, committed public text and real tool-call/result pairs. Inherited parent history, constructor repair closers, injected/system/developer context, private request metadata and tool arguments are not exported. Long public text is split into stable ordered chunks, not silently clipped. Pages contain at most 25 entries with serialized-byte budgets and signed parent/child/catalog/source-bound continuation and tail cursors; teardown invalidates them and releases observations. The non-allowlisted subagent-runs-changed push is not emitted. Validation is focused Host tests only; Cindy source is read-only reference, not imported or executed. No deployment or handset acceptance is claimed.
+
+## Native reminders: existing-dialogue subset
+
+The five existing schedule CRUD calls use the mounted native schedule catalog/create/update/delete APIs. Writes accept an existing active ordinary dialogue, recurring native five-field cron or whole-second intervals of at least 60 seconds, the target's current agent alias, no model/workspace override and all notification switches off. Updates carry the complete observed native record as expected; conflicts are errors, never reread-and-overwrite retries. Explicit intervalMs:null clears an interval only with an expressible replacement cron rule.
+
+Read/delete includes existing native one-time records. Native inactive maps to expired, not paused; delivery timestamps are not model execution completion, run history, costs or unread counts. Unrepresentable fractional calendar rules and oversized data fail explicitly. Pause/resume/run-now/templates/scripts/run reports remain unsupported; this is not an equivalent automation runner or a claim that every scheduler-page control works.
+
+Committed native change notifications produce the existing ready list-invalidation event only for authorized linked peers. One shared observer closes on final unlink, revocation, source replacement or disconnect. Deleting a reminder does not stop an Agent or retract inbox input. Cancellation after persistence is not rollback; known created IDs survive readback/source failures. Write-envelope deduplication is bounded in-process, not durable exactly-once. Validation: 19 focused Host cases; no Cindy source execution, real reminder creation, publication or phone acceptance.
+
+## Native registered Workspace order
+
+Existing sidebar project-order get/apply calls project the native registered Workspace order as custom. Only unique local path keys are accepted; unknown paths, ambiguous worktree groups, duplicate keys, device/dialogue keys and activity mode refuse before any move. An account/device/source-bound owner stamp is available only after a verified relay handshake; it is authorization, not a fabricated order revision.
+
+Native insertBefore moves are serialized and checked against the actual registry after each step. Unrequested Workspaces retain relative order. This is not an atomic replace: concurrent desktop edits or partial persistence failures stop the sequence and report the real same-owner snapshot, without rollback. Native order changes feed the existing sidebar changed event. Twelve focused Host tests cover mapping, ownership, partial/concurrent failures and real Host handshake/source rotation; no live workspaces were reordered.
+
+## Session-reference source and consumption boundary
+
+The existing source-history call reads one authorized ordinary session through a single native observation and current-surface fold, without resolving an Agent. It implements user/assistant role, workdir/agent/time filters, native-position cursor pagination, bounded content with explicit truncation metadata, and a safe terminal-error hint captured from that same prefix. Rewound/all-role history is explicitly unavailable.
+
+Source readability does not imply target consumption. The existing target capability probe returns supported:false/version:1: native current-surface reference resolution cannot atomically admit Cindy frozen/anchored/cross-device snapshots. Nonempty structured references are refused before send/enqueue/steer/edit, durable preparation and replay, rather than silently dropping them or turning them into ordinary text. Empty carriers and literal text links retain ordinary behavior. Twelve focused source/boundary Host tests and 28 directly affected delivery cases passed; Cindy source remained read-only and unexecuted.
 
 ## Previous release and rollback
 

package/lib/client.js

@@ -52,7 +52,7 @@ window.__ModuleLoader__.load({
           stateFailed: "连接失败",
           reconnect: "重新连接",
           loginTitle: "登录 Cindy",
-          loginHint: "本机还没有 Cindy 登录态。用与手机相同的账号登录。",
+          loginHint: "请选择与手机相同的账号和区域；国内版与国际版账户不互通。",
           kindPhone: "手机号",
           kindEmail: "邮箱",
           identifierPhone: "手机号",
@@ -100,7 +100,7 @@ window.__ModuleLoader__.load({
           stateFailed: "Connection failed",
           reconnect: "Reconnect",
           loginTitle: "Sign in to Cindy",
-          loginHint: "This Host has no Cindy session yet. Use the same account as your phone.",
+          loginHint: "Use the same account AND region as your phone. Mainland and Global accounts are separate.",
           kindPhone: "Phone",
           kindEmail: "Email",
           identifierPhone: "Phone number",
@@ -203,7 +203,7 @@ window.__ModuleLoader__.load({
         login,
         host: (status && status.host) || null,
         deviceName: typeof value.deviceName === "string" && value.deviceName.trim() ? value.deviceName.trim() : "DSH Host",
-        showLogin: login.required === true,
+        showLogin: login.authenticated !== true,
         showReconnect: (status ? status.state : "disconnected") === "failed" && login.required !== true,
       };
     }
@@ -380,106 +380,156 @@ window.__ModuleLoader__.load({
       );
     }
 
-    /** The Cindy sign-in form; shown only while the Host reports it needs one. */
-    function LoginForm({ busy, error, notice, accounts, onSendCode, onSignIn, onSelectAccount }) {
-      const [kind, setKind] = react.useState("phone");
-      const [identifier, setIdentifier] = react.useState("");
-      const [code, setCode] = react.useState("");
-
-      const identifierLabel = kind === "phone" ? TEXT.identifierPhone : TEXT.identifierEmail;
-
-      return h(
-        "div",
-        { style: styles.form },
-        h("span", { style: styles.label }, TEXT.loginTitle),
-        h("span", { style: styles.hint }, TEXT.loginHint),
-        h(
-          "div",
-          { style: styles.field },
-          h("span", { style: styles.hint }, TEXT.kindPhone + " / " + TEXT.kindEmail),
-          h(
-            "div",
-            { style: { display: "flex", gap: "6px" } },
-            ["phone", "email"].map((value) =>
-              h(
-                "button",
-                {
-                  key: value,
-                  type: "button",
-                  onClick: () => setKind(value),
-                  style: Object.assign({}, styles.buttonGhost, {
-                    flex: 1,
-                    color: kind === value ? "var(--dsw-alias-label-primary, #e6edf3)" : undefined,
-                    borderColor: kind === value ? "var(--dsw-alias-brand-primary, #2f81f7)" : undefined,
-                  }),
-                },
-                value === "phone" ? TEXT.kindPhone : TEXT.kindEmail,
-              ),
-            ),
-          ),
-        ),
-        h(
-          "label",
-          { style: styles.field },
-          h("span", { style: styles.hint }, identifierLabel),
-          h("input", {
-            style: styles.input,
-            value: identifier,
-            inputMode: kind === "phone" ? "tel" : "email",
-            autoComplete: kind === "phone" ? "tel" : "email",
-            onChange: (event) => setIdentifier(event.target.value),
-            disabled: busy,
-          }),
-        ),
-        h(
-          "div",
-          { style: { display: "flex", gap: "6px", alignItems: "flex-end" } },
-          h(
-            "label",
-            { style: Object.assign({}, styles.field, { flex: 1 }) },
-            h("span", { style: styles.hint }, TEXT.code),
-            h("input", {
-              style: styles.input,
-              value: code,
-              inputMode: "numeric",
-              autoComplete: "one-time-code",
-              onChange: (event) => setCode(event.target.value),
-              disabled: busy,
-            }),
-          ),
-          h(
-            "button",
-            {
-              type: "button",
-              style: Object.assign({}, styles.buttonGhost, { height: "32px" }),
-              disabled: busy,
-              onClick: () => onSendCode({ kind, identifier }),
-            },
-            busy ? TEXT.sending : TEXT.sendCode,
-          ),
-        ),
-        accounts && accounts.length > 0
-          ? h(
-              "div",
-              { style: styles.field },
-              h("span", { style: styles.hint }, TEXT.selectAccount),
-              accounts.map((account) =>
-                h(
-                  "button",
-                  { key: account.id, type: "button", style: styles.buttonGhost, disabled: busy, onClick: () => onSelectAccount(account.id) },
-                  account.displayName || account.id,
-                ),
-              ),
-            )
-          : null,
-        error ? h("p", { style: styles.error }, error) : null,
-        notice ? h("p", { style: styles.ok }, notice) : null,
-        h(
-          "button",
-          { type: "button", style: styles.button, disabled: busy, onClick: () => onSignIn({ kind, identifier, code }) },
-          busy ? TEXT.signingIn : TEXT.signIn,
-        ),
-      );
+    const tr = (zh, en) => ZH ? zh : en;
+    function loginError(code) {
+      const messages = {
+        LOGIN_BUSY: tr("其他页面正在登录，可取消后重新开始。", "Another page is signing in. Cancel it explicitly to restart."),
+        LOGIN_STEP_CHANGED: tr("登录步骤已更新，请重试当前操作。", "The login step changed. Retry the current action."),
+        LOGIN_SUPERSEDED: tr("这次登录已取消或被替换，请重新开始。", "This sign-in was cancelled or replaced. Start again."),
+        ORG_REALM_UNAVAILABLE: tr("无法完整确认企业所在区域，请检查国内/国际网络后重试。", "Cannot verify both regions. Check connectivity and retry."),
+        ORG_REALM_AMBIGUOUS: tr("两个区域都有同名企业，不能自动选择，请联系管理员。", "The organization exists in both regions. Contact its administrator."),
+        ORG_SSO_NOT_FOUND: tr("未找到已启用 SSO 的企业，请检查组织 ID 或域名。", "No SSO-enabled organization found. Check its ID or domain."),
+        INVALID_CAPTCHA_RESULT: tr("请粘贴官方验证页成功后的完整地址栏链接。", "Paste the complete successful verification URL from the official page."),
+        LOGIN_COMMITTING: tr("登录正在安全保存，请等待完成。", "Sign-in is being saved securely. Please wait."),
+        REQUEST_TIMEOUT: tr("登录请求已超时，请重新开始。", "Sign-in timed out. Please start again."),
+        LOGIN_EXPIRED: tr("这次登录已过期，请重新开始。", "This sign-in expired. Please start again."),
+      };
+      return messages[code] || tr("登录未完成，请检查输入或网络后重试", "Sign-in did not complete. Check your input or network and retry") + (code && /^[A-Z0-9_]{1,80}$/.test(code) ? " (" + code + ")" : "");
+    }
+    function safeLoginUrl(value, region) {
+      try {
+        const url = new URL(value);
+        const domain = region === "global" ? "cindy.app" : "cindy.com.cn";
+        return url.protocol === "https:" && !url.username && !url.password && !url.port &&
+          (url.hostname === domain || url.hostname.endsWith("." + domain)) ? url.href : null;
+      } catch { return null; }
+    }
+    /** Pure renderer. Attempt IDs/revisions are capabilities; all backend tickets stay off-page. */
+    function LoginForm({ flow = null, fields = {}, onField = () => {}, onAction = () => {}, onStart = () => {}, busy = false, error = null }) {
+      const region = flow?.region || fields.region || "cn";
+      const step = flow?.step;
+      const disabled = busy || flow?.busy === true;
+      const providers = flow?.providers;
+      const kind = providers?.[fields.kind] ? fields.kind : providers?.phone ? "phone" : "email";
+      const button = (label, action, data = {}, off = disabled) => h("button", { key: action + JSON.stringify(data), type: "button", style: styles.buttonGhost, disabled: off,
+        onClick: () => onAction(action, data) }, label);
+      const input = (name, label, mode = "text", maxLength = 254) => h("label", { style: styles.field }, h("span", { style: styles.hint }, label),
+        h("input", { style: styles.input, value: fields[name] || "", inputMode: mode, maxLength,
+          autoComplete: name === "code" ? "one-time-code" : name === "identifier" ? kind === "phone" ? "tel" : "email" : "off",
+          disabled, onChange: event => onField(name, event.target.value) }));
+      const link = (url, label) => url ? h("a", { href: url, target: "_blank", rel: "noopener noreferrer", referrerPolicy: "no-referrer", style: styles.buttonGhost }, label) : null;
+      let body;
+      if (!flow) body = h("div", { style: styles.field },
+        h("label", { style: styles.field }, tr("账号区域", "Account region"), h("select", { style: styles.input, value: region, disabled,
+          onChange: event => onField("region", event.target.value) }, h("option", { value: "cn" }, tr("国内版", "Mainland China")), h("option", { value: "global" }, tr("国际版", "Global")))),
+        h("button", { type: "button", style: styles.button, disabled, onClick: () => onStart(region, false) }, tr("加载登录方式", "Load sign-in options")));
+      else if (step === "identifier") body = h("div", { style: styles.field },
+        h("div", { style: { display: "flex", flexWrap: "wrap", gap: "8px" } }, (providers?.social || []).map(provider => button(
+          ({ apple: tr("通过 Apple 登录", "Sign in with Apple"), google: "Google", wechat: tr("微信登录", "WeChat") })[provider] || provider,
+          "start_browser", { kind: "social", providerOrConnectionId: provider }))),
+        providers && (providers.phone || providers.email) ? h("div", { style: styles.field },
+          h("div", { style: { display: "flex", gap: "8px" } }, ["phone", "email"].filter(value => providers[value]).map(value =>
+            h("button", { key: value, type: "button", disabled, style: styles.buttonGhost, "aria-pressed": kind === value,
+              onClick: () => onField("kind", value) }, value === "phone" ? TEXT.kindPhone : TEXT.kindEmail))),
+          input("identifier", kind === "phone" ? TEXT.identifierPhone : TEXT.identifierEmail, kind === "phone" ? "tel" : "email"),
+          button(kind === "email" ? tr("继续（检测邮箱登录方式）", "Continue (discover email sign-in)") : TEXT.sendCode,
+            kind === "email" ? "discover_email" : "request_code", { kind, identifier: fields.identifier || "" })) : null,
+        input("org", tr("企业组织 ID / slug / 已验证域名", "Organization ID / slug / verified domain")),
+        button(tr("企业 SSO 登录", "Enterprise SSO"), "discover_org", { org: fields.org || "" }));
+      else if (step === "method-choice") body = h("div", { style: styles.field }, (flow.methods || []).map(method =>
+        method.type === "sso" ? button((method.orgName || "") + " · " + (method.connectionName || "SSO"), "start_browser", { kind: "sso", providerOrConnectionId: method.connectionId })
+          : button(tr("使用个人邮箱验证码（保留原区域）", "Use personal email code (keep original region)"), "personal_email")));
+      else if (step === "region-confirmation") body = h("div", { style: styles.field },
+        h("p", { style: styles.hint }, tr("企业位于", "This organization is in ") + (flow.targetRegion === "global" ? tr("国际区", "Global") : tr("国内区", "Mainland China")) + tr("，确认切换后继续。", ". Confirm the region change to continue.")),
+        button(tr("确认切换区域", "Confirm region change"), "confirm_region"));
+      else if (step === "browser") body = h("div", { style: styles.field },
+        h("p", { style: styles.hint, role: "status" }, tr("请在官方页面完成登录。本页会自动接收结果；5 分钟内有效。", "Complete sign-in on the official page. This page receives the result automatically; valid for 5 minutes.")),
+        link(safeLoginUrl(flow.authorizationUrl, region), tr("打开 Cindy 官方登录页面", "Open official Cindy sign-in")));
+      else if (step === "account-selection") body = h("div", { style: styles.field }, h("span", { style: styles.label }, TEXT.selectAccount),
+        (flow.accounts || []).map(account => button((account.displayName || account.id) + (account.orgName ? " · " + account.orgName : ""), "select_account", { accountId: account.id })));
+      else if (step === "captcha") body = h("div", { style: styles.field },
+        h("p", { style: styles.hint }, tr("请在官方页面完成人机验证，再复制成功页的完整地址栏链接（含 #cindy-captcha=ok.…）粘贴到下方。浏览器安全限制使本页无法自动读取该链接。请勿分享它。", "Complete verification on the official page, then copy its complete URL (including #cindy-captcha=ok.…) below. Browser security prevents automatic return. Do not share this URL.")),
+        link(safeLoginUrl(flow.challengeUrl, region), tr("打开官方人机验证", "Open official verification")),
+        input("captchaResult", tr("验证成功后的完整链接", "Complete successful verification URL"), "url", 12000),
+        button(TEXT.sendCode, "captcha_complete", { resultUrl: fields.captchaResult || "" }));
+      else if (step === "binding") body = h("div", { style: styles.field },
+        h("p", { style: styles.hint }, tr("此账号需要先绑定联系方式。", "This account requires a verified contact.")),
+        input("binding", flow.bindType === "phone" ? TEXT.identifierPhone : TEXT.identifierEmail, flow.bindType === "phone" ? "tel" : "email"),
+        button(TEXT.sendCode, "binding_request", { identifier: fields.binding || "" }), input("code", TEXT.code, "numeric", 100),
+        button(tr("验证并绑定", "Verify and bind"), "binding_verify", { identifier: fields.binding || "", code: fields.code || "" }));
+      else if (step === "sso-verification") body = h("div", { style: styles.field },
+        h("p", { style: styles.hint }, tr("企业 SSO 需要额外验证：", "Enterprise SSO needs additional verification: ") + (flow.targetMasked || "")),
+        button(TEXT.sendCode, "sso_request"), input("code", TEXT.code, "numeric", 100), button(TEXT.signIn, "sso_verify", { code: fields.code || "" }));
+      else if (step === "verification-code") body = h("div", { style: styles.field }, h("p", { style: styles.hint }, TEXT.codeSent + " · " + (flow.targetMasked || "")),
+        input("code", TEXT.code, "numeric", 100), button(TEXT.signIn, "verify_code", { code: fields.code || "" }),
+        button(tr("重新发送验证码", "Resend code"), "request_code", { kind: flow.kind, identifier: fields.identifier || "" }));
+      else body = h("p", { style: styles.hint, role: "status" }, step === "completed" ? TEXT.signedIn : step === "committing" ? tr("正在安全保存登录…", "Saving sign-in securely…") : tr("请重新开始登录。", "Please start sign-in again."));
+      return h("div", { style: styles.form }, h("span", { style: styles.label }, TEXT.loginTitle), h("span", { style: styles.hint }, TEXT.loginHint),
+        flow ? h("p", { style: styles.hint }, tr("账号区域：", "Account region: ") + (region === "global" ? tr("国际版", "Global") : tr("国内版", "Mainland China"))) : null,
+        body, (error || flow?.error) ? h("p", { style: styles.error, role: "alert" }, error || loginError(flow.error)) : null,
+        error === loginError("LOGIN_BUSY") ? h("button", { type: "button", style: styles.buttonGhost, disabled,
+          onClick: () => onStart(region, true) }, tr("取消其他登录并重新开始", "Cancel other sign-in and restart")) : null,
+        flow && !["completed", "committing", "cancelled", "error"].includes(step) ? button(tr("取消这次登录", "Cancel this sign-in"), "cancel", {}, false) : null,
+        flow && step !== "committing" ? h("div", { style: { display: "flex", gap: "8px" } },
+          h("button", { type: "button", style: styles.buttonGhost, disabled, onClick: () => onStart(region, true) }, tr("重新开始", "Start again")),
+          h("button", { type: "button", style: styles.buttonGhost, disabled, onClick: () => onStart(region === "cn" ? "global" : "cn", true) }, tr("切换国内 / 国际区域", "Switch Mainland / Global"))) : null);
+    }
+    function AuthLoginPanel({ onAuthenticated }) {
+      const [flow, setFlow] = react.useState(null);
+      const [fields, setFields] = react.useState({ region: "cn", kind: "phone" });
+      const [busy, setBusy] = react.useState(false);
+      const [error, setError] = react.useState(null);
+      const state = react.useRef({ flow: null, generation: 0, alive: true, busy: false, polling: false });
+      const apply = (result, generation) => {
+        if (!state.current.alive || generation !== state.current.generation) return;
+        const next = result.view;
+        if (next && (!state.current.flow || next.attemptId !== state.current.flow.attemptId || next.revision >= state.current.flow.revision)) {
+          const previous = state.current.flow; state.current.flow = next; setFlow(next);
+          if (previous?.step !== next.step) setFields(value => ({ ...value, code: "", captchaResult: "" }));
+          if (next.step === "completed" && previous?.step !== "completed") onAuthenticated?.();
+        }
+        if (!result.ok) setError(loginError(result.code));
+      };
+      const act = async (action, data = {}) => {
+        const read = action === "read";
+        if (!read && action !== "cancel" && state.current.busy) return;
+        if (read && state.current.polling) return;
+        if (read) state.current.polling = true;
+        else { state.current.busy = true; setBusy(true); setError(null); }
+        const generation = action === "cancel" ? ++state.current.generation : state.current.generation;
+        const current = state.current.flow;
+        try { apply(await postJson("/login/flow", { action, attemptId: current?.attemptId, revision: current?.revision, ...data }), generation); }
+        catch { if (state.current.alive && generation === state.current.generation) setError(tr("请求失败，请重试", "Request failed. Please retry.")); }
+        finally { if (read) state.current.polling = false; else if (generation === state.current.generation) { state.current.busy = false; if (state.current.alive) setBusy(false); } }
+      };
+      const start = async (region, takeover) => {
+        if (state.current.busy) return;
+        const generation = ++state.current.generation; state.current.busy = true; setBusy(true); setError(null);
+        try {
+          const prior = state.current.flow;
+          if (prior && !["completed", "cancelled", "error"].includes(prior.step)) {
+            const cancelled = await postJson("/login/flow", { action: "cancel", attemptId: prior.attemptId });
+            if (!cancelled.ok) { apply(cancelled, generation); return; }
+          }
+          state.current.flow = null; setFlow(null); setFields({ region, kind: region === "cn" ? "phone" : "email" });
+          apply(await postJson("/login/flow", { action: "start", region, takeover }), generation);
+        } catch { if (state.current.alive && generation === state.current.generation) setError(tr("读取登录方式失败，请检查网络后重试", "Cannot load sign-in options. Check your connection and retry.")); }
+        finally { if (generation === state.current.generation) { state.current.busy = false; if (state.current.alive) setBusy(false); } }
+      };
+      react.useEffect(() => {
+        state.current.alive = true;
+        return () => {
+          state.current.alive = false; state.current.generation++;
+          const current = state.current.flow;
+          if (current && !["completed", "cancelled", "error"].includes(current.step)) void postJson("/login/flow", { action: "cancel", attemptId: current.attemptId }).catch(() => {});
+        };
+      }, []);
+      react.useEffect(() => {
+        if (!flow || !["browser", "committing"].includes(flow.step)) return;
+        const timer = setInterval(() => { void act("read"); }, POLL_MS);
+        return () => clearInterval(timer);
+      }, [flow?.attemptId, flow?.step]);
+      return h(LoginForm, { flow, fields, busy, error, onField: (name, value) => setFields(old => ({ ...old, [name]: value })), onAction: act, onStart: start });
     }
 
     /** Keep an unsaved draft independent of status polling and settings snapshots. */
@@ -568,8 +618,6 @@ window.__ModuleLoader__.load({
         const [busy, setBusy] = react.useState(false);
         const [error, setError] = react.useState(null);
         const [notice, setNotice] = react.useState(null);
-        const [accounts, setAccounts] = react.useState(null);
-        const [loginTicket, setLoginTicket] = react.useState(null);
 
         const refresh = react.useCallback(() => setRefreshKey((value) => value + 1), []);
 
@@ -625,43 +673,6 @@ window.__ModuleLoader__.load({
           if (result.status) setStatus(result.status);
         });
 
-        const onSendCode = ({ kind, identifier }) =>
-          guard(async () => {
-            setNotice(null);
-            const result = await postJson("/login/request-code", { kind, identifier });
-            if (!result.ok) {
-              setError(result.message || "验证码发送失败");
-              return;
-            }
-            setNotice(TEXT.codeSent);
-          });
-
-        const onSignIn = ({ kind, identifier, code }) =>
-          guard(async () => {
-            setNotice(null);
-            setAccounts(null);
-            const result = await postJson("/login/verify-code", { kind, identifier, code });
-            if (!result.ok) {
-              if (result.status === "select_account" && Array.isArray(result.accounts)) {
-                setAccounts(result.accounts);
-                setLoginTicket(result.loginTicket);
-              }
-              setError(result.message || "登录失败");
-              return;
-            }
-            setNotice(null);
-          });
-
-        const onSelectAccount = (accountId) =>
-          guard(async () => {
-            const result = await postJson("/login/select-account", { loginTicket, accountId });
-            if (!result.ok) {
-              setError(result.message || "账户选择失败");
-              return;
-            }
-            setAccounts(null);
-          });
-
         const onReconnect = () => guard(async () => {
           const result = await postJson("/reconnect", {});
           if (!result.ok) setError(result.message || "重新连接失败");
@@ -720,12 +731,12 @@ window.__ModuleLoader__.load({
             ? h(
                 "div",
                 { style: styles.row },
-                h("span", { style: styles.hint }, TEXT.signedIn + (maskIdentifier(view.login.identifier) ? " · " + maskIdentifier(view.login.identifier) : "")),
+                h("span", { style: styles.hint }, TEXT.signedIn + (view.login.realm ? ' · ' + (view.login.realm === 'global' ? tr('国际版', 'Global') : tr('国内版', 'Mainland China')) : '') + (maskIdentifier(view.login.identifier) ? " · " + maskIdentifier(view.login.identifier) : "")),
                 h("button", { type: "button", style: styles.buttonGhost, disabled: busy, onClick: onLogout }, TEXT.logout),
               )
             : null,
 
-          view.showLogin ? h(LoginForm, { busy, error, notice, accounts, onSendCode, onSignIn, onSelectAccount }) : null,
+          view.showLogin ? h(AuthLoginPanel, { onAuthenticated: refresh }) : null,
 
           view.showReconnect
             ? h(
@@ -735,7 +746,7 @@ window.__ModuleLoader__.load({
               )
             : null,
 
-          error && !view.showLogin ? h("p", { style: styles.error }, error) : null,
+          error ? h("p", { style: styles.error }, error) : null,
 
           h(
             "div",
@@ -851,7 +862,7 @@ window.__ModuleLoader__.load({
     // Test seam: the presentation helpers and sub-components, so the markup
     // rules can be rendered and asserted without a browser. Not part of the
     // plugin contract — the runner reads only `apply` and `inject`.
-    exports.__internals = { TEXT, NAMESPACE, API, SECTION_ORDER, resolveCardView, bindSettingsPage, stateText, stateColor, platformText, writeSwitch, validHostName, writeHostName, HostNameForm, readStatus, maskIdentifier, Switch, LoginForm, DeviceRow, createCindySettingsPage };
+    exports.__internals = { TEXT, NAMESPACE, API, SECTION_ORDER, resolveCardView, bindSettingsPage, stateText, stateColor, platformText, writeSwitch, validHostName, writeHostName, HostNameForm, readStatus, maskIdentifier, Switch, LoginForm, AuthLoginPanel, safeLoginUrl, loginError, DeviceRow, createCindySettingsPage };
     return module.exports;
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cindy-host",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "private": false,
   "description": "Cindy 手机客户端连接 DSH 的 Host 侧插件：会话/消息/审批/todo/goal 的手机通道，以及配套的设置卡片",
   "license": "MIT",
@@ -68,6 +68,7 @@
   },
   "//peerDependencies": "DSH 自己的包必须由宿主提供，绝不能声明成 dependency/optionalDependency：pnpm 会把它们**连同整代依赖图**装进 profile，宿主再组合这个混合体就起不来（实测：`^0.1.1-rc.2` 会把 28 个 0.1.1-rc.2 的包装进一个 0.1.5-rc.2 的宿主，profile 启动失败于 dsh-client-file-upload / dsh-session）。区间必须覆盖宿主那一代（semver 的预发布规则：`^0.1.1-rc.2` 匹配不到 `0.1.5-rc.2`），与生态里 dsh-codex / dsh-cost-meter 的写法一致；`0.2.0-rc.2` 需要 `>=0.2.0-rc.1 <0.3.0-0`。",
   "peerDependencies": {
+    "@deepseek-ai/dsh-agent": "0.2.1-rc.3 || 0.2.1-rc.4 || 0.2.1-rc.5 || 0.2.2-alpha.2",
     "@deepseek-ai/dsh-session": "0.2.1-rc.3 || 0.2.1-rc.4 || 0.2.1-rc.5 || 0.2.2-alpha.2",
     "@deepseek-ai/dsh-settings": "0.2.1-rc.3 || 0.2.1-rc.4 || 0.2.1-rc.5 || 0.2.2-alpha.2",
     "@deepseek-ai/schemastery": "^3.18.1 || 3.18.6-alpha.1"