Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

feat(cindy-make): centralize preparation and reuse prepared dependencies

Lizic0377026a053
diff --git a/apps/desktop/cindy-runtime-source.ts b/apps/desktop/cindy-runtime-source.ts
new file mode 100644
index 0000000000..316306dc05
--- /dev/null
+++ b/apps/desktop/cindy-runtime-source.ts
@@ -0,0 +1,63 @@
+import { execFileSync } from 'node:child_process';
+import { readFileSync } from 'node:fs';
+import path from 'node:path';
+import type { Plugin } from 'vite';
+import type { RuntimeSourceBuild } from './src/main/cindy-make/runtimeVersion';
+
+export function captureRuntimeSource(
+ root: string,
+ development: boolean,
+ deps = {
+ git: (args: string[]) =>
+ execFileSync('git', args, {
+ cwd: root,
+ encoding: 'utf8',
+ timeout: 3000,
+ maxBuffer: 256 * 1024,
+ windowsHide: true,
+ stdio: ['ignore', 'pipe', 'pipe'],
+ }),
+ readPackage: () => readFileSync(path.join(root, 'apps/desktop/package.json'), 'utf8'),
+ },
+): RuntimeSourceBuild {
+ try {
+ const commit = deps.git(['rev-parse', 'HEAD']).trim();
+ if (!/^[a-f0-9]{40}$/.test(commit)) return {};
+ const status = deps.git(['status', '--porcelain=v1', '-z', '--untracked-files=normal']);
+ let dirty = status.length > 0;
+ if (!development && status === ' M apps/desktop/package.json\0') {
+ const original = JSON.parse(deps.git(['show', 'HEAD:apps/desktop/package.json']));
+ const packaged = JSON.parse(deps.readPackage());
+ delete original.version;
+ delete packaged.version;
+ dirty = JSON.stringify(original) !== JSON.stringify(packaged);
+ }
+ if (deps.git(['rev-parse', 'HEAD']).trim() !== commit) return {};
+ return { commit, dirty, ...(development ? { root } : {}) };
+ } catch {
+ return {};
+ }
+}
+
+export function cindyRuntimeSourcePlugin(
+ root: string,
+ development: boolean,
+ capture = () => captureRuntimeSource(root, development),
+): Plugin {
+ const matches = (id: string) =>
+ id.replaceAll('\\', '/').endsWith('/cindy-make/runtimeVersion.ts');
+ return {
+ name: 'cindy-runtime-source',
+ enforce: 'pre',
+ shouldTransformCachedModule({ id }) {
+ return matches(id) ? true : undefined;
+ },
+ transform(source, id) {
+ if (!matches(id)) return;
+ return {
+ code: source.replaceAll('import.meta.env.CINDY_RUNTIME_SOURCE', JSON.stringify(capture())),
+ map: null,
+ };
+ },
+ };
+}
diff --git a/apps/desktop/src/main/bootstrap-electron.ts b/apps/desktop/src/main/bootstrap-electron.ts
index b6b5ced3b8..d81fc45c55 100644
--- a/apps/desktop/src/main/bootstrap-electron.ts
+++ b/apps/desktop/src/main/bootstrap-electron.ts
@@ -1,8 +1,15 @@
import { retainProviderPresentationAfterAuthChange } from './maker-host/provider-presentation-store.js';
import { codexAccountState } from './maker-host/codex-account-auth.js';
import { syncSubscriptionAccountUsage } from './usage/subscriptionAccountUsage.js';
-import { clearSubscriptionAccountDiscoveredModels, setSubscriptionAccountInvalidatedHandler } from './maker-host/subscription-account-auth.js';
-import { startWorktreeRecycleMaintenance, stopWorktreeRecycleMaintenance, auditRegisteredWorktrees } from './worktree/recycleMaintenance';
+import {
+ clearSubscriptionAccountDiscoveredModels,
+ setSubscriptionAccountInvalidatedHandler,
+} from './maker-host/subscription-account-auth.js';
+import {
+ startWorktreeRecycleMaintenance,
+ stopWorktreeRecycleMaintenance,
+ auditRegisteredWorktrees,
+} from './worktree/recycleMaintenance';
import { requestWorktreeRecycle } from './worktree/managedRecycle';
import { recycleSessionWorktreeForStatusChange } from './localDb/ipc/sessions';
import { tryGetDbClient } from './localDb/client/current';
@@ -28,10 +35,7 @@ import {
import { resolveVibrancyConfig } from './vibrancyConfig';
import { getSessionThinkingSnapshots, getHistoryToolName } from './messagePersistBroadcaster';
import { applyVibrancyToSecondaryWindows } from './secondary-windows';
-import {
- rememberResolvedAppTheme,
- resolveAppThemeIsDark,
-} from './resolved-app-theme';
+import { rememberResolvedAppTheme, resolveAppThemeIsDark } from './resolved-app-theme';
import {
parseWindowThemeVibrancyPayload,
readWindowThemeSnapshot,
@@ -295,10 +299,7 @@ import {
stageLocalFileToCache,
} from './file-browser/remote-file-cache';
import { sweepLegacyDialogueWorkingDirs } from './localDb/dialogueWorkdirSelfHeal';
-import {
- BRAND_IDENTITY,
- legacyDialogueUserDataDirNames,
-} from '@cindy/maker-shared/brand-identity';
+import { BRAND_IDENTITY, legacyDialogueUserDataDirNames } from '@cindy/maker-shared/brand-identity';
import * as videoCacheStore from './videoCacheStore';
import { imageSchemePrivilege, registerImageProtocolHandler } from './imageProtocol';
import { videoSchemePrivilege, registerVideoProtocolHandler } from './videoProtocol';
@@ -318,9 +319,14 @@ import {
subscribeCindySourceStatus,
} from './cindy-make/sourcePreparation.js';
import { broadcastCindyMakeSourceStatus } from './cindy-make/sourceStatusBroadcast.js';
+import { cindyMakeManager } from './cindy-make/manager.js';
+import { broadcastCindyMakeState } from './cindy-make/stateBroadcast.js';
import { CINDY_MAKE_RUN_ID_PATTERN } from './cindy-make/sourcePaths.js';
import { prepareCindyMakeWorkspace } from './cindy-make/taskWorkspace.js';
-import { createMakeToolchainEnvironment } from './cindy-make/toolchainEnvironment.js';
+import {
+ createMakeToolchainEnvironment,
+ resolveMakeToolEnvironment,
+} from './cindy-make/toolchainEnvironment.js';
import { createStorageIpcHandlers } from './cindy-media/storageIpc';
import {
collectDatabaseSizeWarningStatus,
@@ -353,10 +359,7 @@ import { resolveWorkspacePathCached, resolveWorkspacePathBatchCached } from './p
import { registerLocalDbIpc } from './localDb/ipc/registerAll';
import { getActiveCatalog } from './maker-host/active-catalog';
import { resolveSessionContextWindow } from '../shared/sessionContextWindow';
-import {
- getSessionRowSnapshot,
- resumeDeletedPiSubagentCleanup,
-} from './localDb/ipc/sessions';
+import { getSessionRowSnapshot, resumeDeletedPiSubagentCleanup } from './localDb/ipc/sessions';
import {
registerLegacyMigrationIpc,
runLegacyUserDataMigrationForUser,
@@ -715,7 +718,10 @@ import {
writeImDefaultSettingsPatch,
} from './im/defaultSettingsStore.js';
import { hasClaudeAiOAuth } from './maker-host/claude-credentials-store.js';
-import { disconnectClaudeAiOAuth, reconnectClaudeAiOAuth } from './maker-host/claude-oauth-refresh.js';
+import {
+ disconnectClaudeAiOAuth,
+ reconnectClaudeAiOAuth,
+} from './maker-host/claude-oauth-refresh.js';
import { beginClaudeLocalLogin, cancelClaudeOAuthLogin } from './maker-host/claude-oauth-login.js';
import {
runGrokOAuthLogin,
@@ -1016,7 +1022,12 @@ import {
resetSchedulerReady,
} from './maker-ipc/schedule.js';
import { registerProjectAutomationIpc } from './maker-ipc/project-automation.js';
-import { startGoalController, getGoalController, resetGoalController, getGoalTeardownGeneration } from './goal-host/index.js';
+import {
+ startGoalController,
+ getGoalController,
+ resetGoalController,
+ getGoalTeardownGeneration,
+} from './goal-host/index.js';
import { startLearnHost, getLearnController, resetLearnController } from './learn-host/index.js';
import { fetchHubSkillReference } from './learn-host/hubReference.js';
import { registerLearnIpc, broadcastLearnEvent } from './learn-host/registerIpc.js';
@@ -1059,7 +1070,11 @@ async function waitForCurrentAccountProviderModelsReady(): Promise<void> {
}
// Live getters preserve account/scheduler replacement without loading Main modules at dispatch time.
-configureRoutineHost({ getBot: getBotRemoteResourceSource, getScheduler: getSchedulerIfInitialized, getScheduleStorage });
+configureRoutineHost({
+ getBot: getBotRemoteResourceSource,
+ getScheduler: getSchedulerIfInitialized,
+ getScheduleStorage,
+});
/**
* Phase 4: 不再用 `_schedulerStarted` flag —— `startScheduler()` 内部以 `_scheduler`
@@ -1138,7 +1153,9 @@ async function attemptStartSchedulerOnce(): Promise<void> {
// the boundary check immediately before listener publication as a second
// guard so a stale generation can never make readiness visible.
if (getGoalTeardownGeneration() !== goalGenBefore) {
- console.log('[bootstrap-electron] attemptStartScheduler: teardown raced scheduler start, aborting stale scheduler attach');
+ console.log(
+ '[bootstrap-electron] attemptStartScheduler: teardown raced scheduler start, aborting stale scheduler attach',
+ );
await resetScheduler();
return;
}
@@ -1160,7 +1177,9 @@ async function attemptStartSchedulerOnce(): Promise<void> {
// keep the old post-await fence as well so it cannot continue into
// GoalController/learn-host startup with the stale maker.
if (getGoalTeardownGeneration() !== goalGenBefore) {
- console.log('[bootstrap-electron] attemptStartScheduler: teardown raced scheduler start, aborting stale account startup');
+ console.log(
+ '[bootstrap-electron] attemptStartScheduler: teardown raced scheduler start, aborting stale account startup',
+ );
return;
}
// GoalController 与 scheduler 同就绪点启动(maker + localDb 均 ready):内部幂等
@@ -1263,10 +1282,7 @@ function assertCompactionMutationOwner(raw: unknown): void {
isAppSessionBoundaryPending(),
)
) {
- throwIpcError(
- 'PRECONDITION_FAILED',
- 'Compaction setting belongs to a stale account session.',
- );
+ throwIpcError('PRECONDITION_FAILED', 'Compaction setting belongs to a stale account session.');
}
}
@@ -1391,9 +1407,7 @@ const chatEmbeddingSettingsWatcher = createChatEmbeddingSettingsWatcher(() => {
});
function rebindChatEmbeddingSettingsWatcher(): void {
- chatEmbeddingSettingsWatcher.rebind(
- ownerScopedUserDataPath('chat-embedding-settings.json'),
- );
+ chatEmbeddingSettingsWatcher.rebind(ownerScopedUserDataPath('chat-embedding-settings.json'));
}
app.once('will-quit', () => chatEmbeddingSettingsWatcher.dispose());
@@ -1504,8 +1518,12 @@ async function teardownGhostProjectionBoundary(reason: string): Promise<void> {
}
};
- await run('interruptGhostCallsForAccountBoundary', () => withAuthBoundaryTimeout('interrupt Ghost calls', interruptGhostCallsForAccountBoundary));
- await run('waitForGhostMutations', () => withAuthBoundaryTimeout('wait for Ghost mutations', waitForGhostMutations));
+ await run('interruptGhostCallsForAccountBoundary', () =>
+ withAuthBoundaryTimeout('interrupt Ghost calls', interruptGhostCallsForAccountBoundary),
+ );
+ await run('waitForGhostMutations', () =>
+ withAuthBoundaryTimeout('wait for Ghost mutations', waitForGhostMutations),
+ );
await run('suspendAllGhosts', suspendAllGhosts);
if (failures.length > 0) {
@@ -1525,8 +1543,8 @@ class PiSubagentAccountBoundaryError extends Error {
detail = 'PI Subagent runners could not be confirmed stopped',
) {
super(
- `${detail} on ${reason}; `
- + 'account switch aborted so the outgoing account\'s credentials are not left in use',
+ `${detail} on ${reason}; ` +
+ "account switch aborted so the outgoing account's credentials are not left in use",
);
this.name = 'PiSubagentAccountBoundaryError';
}
@@ -1667,7 +1685,10 @@ async function teardownAuthAccountBoundary(reason: string): Promise<void> {
// The boundary is already marked pending by every caller. New actions now
// fail closed; drain an action that crossed the boundary before closing its DB.
try {
- await withAuthBoundaryTimeout('wait for turn change-set actions', waitForTurnChangeSetActions);
+ await withAuthBoundaryTimeout(
+ 'wait for turn change-set actions',
+ waitForTurnChangeSetActions,
+ );
} catch (error) {
blockingFailures.push(error);
authBoundaryLog.error(`waitForTurnChangeSetActions on ${reason} failed`, error);
@@ -1819,136 +1840,137 @@ async function teardownAuthAccountBoundary(reason: string): Promise<void> {
} catch (err) {
authBoundaryLog.error(`resetGoalController on ${reason} failed (non-fatal):`, err);
}
- // Same fence, same ordering argument, as quit and the update relaunch: raised
- // before `maker.shutdown` so it covers the shutdown *and* the sweep below.
- // `Maker.shutdown` reports per-session detach failures rather than throwing,
- // so a parent Pi can survive it — and a survivor could publish a fresh run
- // after the one-shot sweep had already scanned, handing the next owner a
- // runner holding the previous account's credentials.
- //
- // Unlike quit, this must come down on *every* path. An account boundary swaps
- // the owner inside a live process: a fence left standing would refuse the
- // incoming owner's own durable launches for the rest of this process's life.
- // Raised inside the suppression `try` so that finally releases both.
- // Did the Maker singleton get poisoned, and is it still holding anything?
+ // Same fence, same ordering argument, as quit and the update relaunch: raised
+ // before `maker.shutdown` so it covers the shutdown *and* the sweep below.
+ // `Maker.shutdown` reports per-session detach failures rather than throwing,
+ // so a parent Pi can survive it — and a survivor could publish a fresh run
+ // after the one-shot sweep had already scanned, handing the next owner a
+ // runner holding the previous account's credentials.
+ //
+ // Unlike quit, this must come down on *every* path. An account boundary swaps
+ // the owner inside a live process: a fence left standing would refuse the
+ // incoming owner's own durable launches for the rest of this process's life.
+ // Raised inside the suppression `try` so that finally releases both.
+ // Did the Maker singleton get poisoned, and is it still holding anything?
+ //
+ // `Maker.shutdown` sets `shutdownStarted` on entry and never clears it, so
+ // once it has run every later `createSession` is refused with "Maker is
+ // shutting down". That is fine when the handover completes — the Maker is
+ // replaced — but an aborted handover leaves the user on the old account
+ // with a singleton that can no longer start a task until the app restarts.
+ let shutdownRan = false;
+ let retainedPiSessions = 0;
+ try {
+ const maker = getMakerIfReady();
+ // Logout / account switch: the owner DbClient is disposed a few lines
+ // below and the gateway credentials behind every proxy token are being
+ // replaced. Adapters that keep parent-independent children alive across an
+ // ordinary close (PI durable Subagents) must stop them here instead.
+ // Marked before the await: `shutdownStarted` is set on entry, so the
+ // singleton is poisoned even if this rejects.
+ if (maker) shutdownRan = true;
+ const shutdownReport = maker
+ ? await maker.shutdown({ reason: 'account-boundary' })
+ : undefined;
+ // A PI session whose detach threw may still have a live process, and that
+ // process owns durable children holding BYOM credentials this account
+ // cannot revoke. Recorded now, acted on after the sweep — the sweep is
+ // still worth running, but it cannot make this failure disappear.
//
- // `Maker.shutdown` sets `shutdownStarted` on entry and never clears it, so
- // once it has run every later `createSession` is refused with "Maker is
- // shutting down". That is fine when the handover completes — the Maker is
- // replaced — but an aborted handover leaves the user on the old account
- // with a singleton that can no longer start a task until the app restarts.
- let shutdownRan = false;
- let retainedPiSessions = 0;
- try {
- const maker = getMakerIfReady();
- // Logout / account switch: the owner DbClient is disposed a few lines
- // below and the gateway credentials behind every proxy token are being
- // replaced. Adapters that keep parent-independent children alive across an
- // ordinary close (PI durable Subagents) must stop them here instead.
- // Marked before the await: `shutdownStarted` is set on entry, so the
- // singleton is poisoned even if this rejects.
- if (maker) shutdownRan = true;
- const shutdownReport = maker
- ? await maker.shutdown({ reason: 'account-boundary' })
- : undefined;
- // A PI session whose detach threw may still have a live process, and that
- // process owns durable children holding BYOM credentials this account
- // cannot revoke. Recorded now, acted on after the sweep — the sweep is
- // still worth running, but it cannot make this failure disappear.
- //
- // Only PI is escalated. Other agents' detach failures stay logged and
- // non-fatal exactly as before: their children die with the parent, so a
- // failed teardown does not leave revocation-proof credentials in use.
- const piSessionFailures = (shutdownReport?.sessionFailures ?? [])
- .filter((failure) => failure.agentKind === 'pi');
- // A session whose detach failed is *kept*: `Session.detach` leaves it in
- // `error`, not `closed`, so the Maker keeps its status listener and its
- // active-session slot deliberately, and a later `shutdown()` retries it.
- // That makes this Maker the only remaining supervision surface for a PI
- // process that may still be alive — which decides whether the abort path
- // below may discard it.
- retainedPiSessions = piSessionFailures.length;
- for (const failure of piSessionFailures) {
- authBoundaryLog.error(
- `PI session ${failure.sessionId} failed to detach on ${reason}:`,
- failure.error,
- );
- }
- // maker.shutdown only reaches tasks that still have a live handle. A
- // detached PI Subagent whose parent task was closed earlier has no handle
- // left, but it is still holding a transferred proxy lease and still
- // writing the workspace — sweep the whole agent home so no child of the
- // outgoing owner survives into the next one. Same call the quit path uses;
- // idempotent with the per-handle stop above.
- // This one is *not* non-fatal. Everything below hands the runtime to the
- // next owner: the Maker is discarded, the outgoing database is disposed
- // and the app session is committed to a new account. A runner we could
- // not confirm as stopped keeps running against direct BYOM credentials
- // from the outgoing account — credentials no token revocation can reach —
- // so completing the handover would leave the previous account paying for,
- // and the previous workspace being edited by, a process nobody is left to
- // supervise. Abort instead and let the logout / switch fail and be
- // retried. Scope is unchanged: only runs attributable to this runtime are
- // waited on or killed, so another instance's runners never block us.
- const stopped = await stopAllPiSubagentRunsForExit(
- path.join(app.getPath('userData'), 'pi-agent-home'),
- undefined,
- // A runner that never consumes its mailbox still holds direct BYOM
- // credentials from the outgoing account, and those cannot be revoked
- // the way the proxy token can. Escalate to a verified kill rather than
- // logging and handing the account over.
- { hostPid: process.pid, killUnresponsiveRunners: true },
- ).catch((err: unknown) => {
- throw new PiSubagentAccountBoundaryError(reason, err);
- });
- if (!stopped) throw new PiSubagentAccountBoundaryError(reason);
- if (piSessionFailures.length > 0) {
- throw new PiSubagentAccountBoundaryError(
- reason,
- piSessionFailures[0]?.error,
- `${piSessionFailures.length} PI session(s) could not be torn down`,
- );
- }
- resetMaker();
- } catch (err) {
- // The abort above must not be laundered into "non-fatal": it is the one
- // failure in this block that has to stop the handover.
- if (err instanceof PiSubagentAccountBoundaryError) {
- authBoundaryLog.error(`${err.message} (cause:`, err.cause, ')');
- // The handover is aborted and the user stays on the old account — with
- // a Maker that has already been shut down and now refuses every new
- // task. Replace it, exactly as the non-fatal path below does, so the
- // account the user is still on remains usable and a retried logout
- // starts from a clean instance.
- //
- // Only when nothing is still attached to it. Survivors of a *sweep*
- // failure are detached runners: their ownership lives in durable files,
- // their pid, and the `runtimeOwnerId` stamped into their status — none
- // of it on this object, and the retried logout sweeps the whole agent
- // home again. A session whose *detach* failed is the opposite: the
- // Maker is holding its handle on purpose so the next `shutdown()` can
- // retry it, and discarding the instance would orphan a live PI process
- // still spending this account's credentials. Staying poisoned is the
- // lesser harm there, and the log above is what says so.
- if (shutdownRan && retainedPiSessions === 0) resetMaker();
- markAccountBoundaryAbortedMidTeardown(reason);
- throw err;
- }
- authBoundaryLog.error(`maker shutdown on ${reason} failed (non-fatal):`, err);
- resetMaker();
- }
- // device-link 单持有者仲裁:必须在 dispose DbClient **之前**释放持有权行
- // (dispose 同步 clearCurrentDbClient,之后 store 不可用,只能等 15s+ 心跳
- // 过期,同机幸存实例接管变慢)。内部带 1.5s 超时,不会卡住登出。
- try {
- await releaseDeviceLinkOwnershipBeforeLogout();
- } catch (err) {
+ // Only PI is escalated. Other agents' detach failures stay logged and
+ // non-fatal exactly as before: their children die with the parent, so a
+ // failed teardown does not leave revocation-proof credentials in use.
+ const piSessionFailures = (shutdownReport?.sessionFailures ?? []).filter(
+ (failure) => failure.agentKind === 'pi',
+ );
+ // A session whose detach failed is *kept*: `Session.detach` leaves it in
+ // `error`, not `closed`, so the Maker keeps its status listener and its
+ // active-session slot deliberately, and a later `shutdown()` retries it.
+ // That makes this Maker the only remaining supervision surface for a PI
+ // process that may still be alive — which decides whether the abort path
+ // below may discard it.
+ retainedPiSessions = piSessionFailures.length;
+ for (const failure of piSessionFailures) {
authBoundaryLog.error(
- `[bootstrap-electron] release device-link ownership on ${reason} failed (non-fatal):`,
- err,
+ `PI session ${failure.sessionId} failed to detach on ${reason}:`,
+ failure.error,
+ );
+ }
+ // maker.shutdown only reaches tasks that still have a live handle. A
+ // detached PI Subagent whose parent task was closed earlier has no handle
+ // left, but it is still holding a transferred proxy lease and still
+ // writing the workspace — sweep the whole agent home so no child of the
+ // outgoing owner survives into the next one. Same call the quit path uses;
+ // idempotent with the per-handle stop above.
+ // This one is *not* non-fatal. Everything below hands the runtime to the
+ // next owner: the Maker is discarded, the outgoing database is disposed
+ // and the app session is committed to a new account. A runner we could
+ // not confirm as stopped keeps running against direct BYOM credentials
+ // from the outgoing account — credentials no token revocation can reach —
+ // so completing the handover would leave the previous account paying for,
+ // and the previous workspace being edited by, a process nobody is left to
+ // supervise. Abort instead and let the logout / switch fail and be
+ // retried. Scope is unchanged: only runs attributable to this runtime are
+ // waited on or killed, so another instance's runners never block us.
+ const stopped = await stopAllPiSubagentRunsForExit(
+ path.join(app.getPath('userData'), 'pi-agent-home'),
+ undefined,
+ // A runner that never consumes its mailbox still holds direct BYOM
+ // credentials from the outgoing account, and those cannot be revoked
+ // the way the proxy token can. Escalate to a verified kill rather than
+ // logging and handing the account over.
+ { hostPid: process.pid, killUnresponsiveRunners: true },
+ ).catch((err: unknown) => {
+ throw new PiSubagentAccountBoundaryError(reason, err);
+ });
+ if (!stopped) throw new PiSubagentAccountBoundaryError(reason);
+ if (piSessionFailures.length > 0) {
+ throw new PiSubagentAccountBoundaryError(
+ reason,
+ piSessionFailures[0]?.error,
+ `${piSessionFailures.length} PI session(s) could not be torn down`,
);
}
- await lifecycleDbClientManager.dispose(reason);
+ resetMaker();
+ } catch (err) {
+ // The abort above must not be laundered into "non-fatal": it is the one
+ // failure in this block that has to stop the handover.
+ if (err instanceof PiSubagentAccountBoundaryError) {
+ authBoundaryLog.error(`${err.message} (cause:`, err.cause, ')');
+ // The handover is aborted and the user stays on the old account — with
+ // a Maker that has already been shut down and now refuses every new
+ // task. Replace it, exactly as the non-fatal path below does, so the
+ // account the user is still on remains usable and a retried logout
+ // starts from a clean instance.
+ //
+ // Only when nothing is still attached to it. Survivors of a *sweep*
+ // failure are detached runners: their ownership lives in durable files,
+ // their pid, and the `runtimeOwnerId` stamped into their status — none
+ // of it on this object, and the retried logout sweeps the whole agent
+ // home again. A session whose *detach* failed is the opposite: the
+ // Maker is holding its handle on purpose so the next `shutdown()` can
+ // retry it, and discarding the instance would orphan a live PI process
+ // still spending this account's credentials. Staying poisoned is the
+ // lesser harm there, and the log above is what says so.
+ if (shutdownRan && retainedPiSessions === 0) resetMaker();
+ markAccountBoundaryAbortedMidTeardown(reason);
+ throw err;
+ }
+ authBoundaryLog.error(`maker shutdown on ${reason} failed (non-fatal):`, err);
+ resetMaker();
+ }
+ // device-link 单持有者仲裁:必须在 dispose DbClient **之前**释放持有权行
+ // (dispose 同步 clearCurrentDbClient,之后 store 不可用,只能等 15s+ 心跳
+ // 过期,同机幸存实例接管变慢)。内部带 1.5s 超时,不会卡住登出。
+ try {
+ await releaseDeviceLinkOwnershipBeforeLogout();
+ } catch (err) {
+ authBoundaryLog.error(
+ `[bootstrap-electron] release device-link ownership on ${reason} failed (non-fatal):`,
+ err,
+ );
+ }
+ await lifecycleDbClientManager.dispose(reason);
} finally {
releaseEndedSuppression();
}
@@ -2008,7 +2030,8 @@ authManager.setProjectionRepairTeardown(teardownGhostProjectionBoundary);
void clearStalePiSubagentLaunchFence(path.join(app.getPath('userData'), 'pi-agent-home'))
.catch((err: unknown) => {
piSubagentLog.warn('stale Subagent launch fence cleanup failed (non-fatal):', err);
- });
+ },
+);
try {
reapClaudeOrphansSync();
@@ -2353,8 +2376,13 @@ const resourceUsageWindowController = new ResourceUsageWindowController({
},
});
registerResourceUsageWindowIpc({ controller: resourceUsageWindowController });
-const remoteDesktopViewerWindows = new RemoteDesktopViewerWindows(sender =>
- isResourceUsageOpenSender({ sender, mainWindow: mainWindowRef, senderWindow: BrowserWindow.fromWebContents(sender), isSecondaryAppWindow }),
+const remoteDesktopViewerWindows = new RemoteDesktopViewerWindows((sender) =>
+ isResourceUsageOpenSender({
+ sender,
+ mainWindow: mainWindowRef,
+ senderWindow: BrowserWindow.fromWebContents(sender),
+ isSecondaryAppWindow,
+ }),
);
remoteDesktopViewerWindows.register();
@@ -2403,9 +2431,7 @@ registerTabOpResultHandler({
// an automation tab-op pop the sidebar window first when the user prefers
// detached mode but has the window closed.
setMainWindowAccessorForBackend(() => rsbWindowController.getHostWebContents());
-setEnsureHostForBackend((sessionId) =>
- rsbWindowController.ensureOpenForAutomation({ sessionId }),
-);
+setEnsureHostForBackend((sessionId) => rsbWindowController.ensureOpenForAutomation({ sessionId }));
setIsDetachedForBackend(() => readRsbWindowSettings().detached);
setBrowserSessionUploadRootResolver(async (sessionId) => {
try {
@@ -2576,7 +2602,7 @@ if (started) {
// 孤儿心跳兜底:如果持有者 PID 已死、心跳却持续刷新锁(更新脚本被
// 单独 kill、心跳子进程还活着),不能无限等。心跳每次 5s 刷新,连续
// 3 个心跳周期都看到「PID 死 + mtime 新」就判定为孤儿,清锁继续启动。
- const orphanGraceMs = (staleAfterMs * 2) + 5_000;
+ const orphanGraceMs = staleAfterMs * 2 + 5_000;
let deadButFreshSinceMs: number | null = null;
// 记录是否在锁上等过,供等锁实例醒来后 exec 自己(见循环下方)。
let waitedForUpdateLock = false;
@@ -3448,9 +3474,7 @@ if (process.platform === 'darwin') {
function applyMainWindowBackgroundThrottling(): void {
const win = mainWindowRef;
if (!win || win.isDestroyed() || win.webContents.isDestroyed()) return;
- win.webContents.setBackgroundThrottling(
- mainWindowBackgroundThrottlingAllowed,
- );
+ win.webContents.setBackgroundThrottling(mainWindowBackgroundThrottlingAllowed);
}
function setMainWindowBackgroundThrottlingForActiveTurn(hasRunningTurn: boolean): void {
@@ -3684,12 +3708,12 @@ const createWindow = () => {
// mac:创建期即透明底+sidebar 材质(Electron setBackgroundColor 运行时改 alpha 不可靠,是 vibrancy 不透壁纸的根因;非 CINDY 皮肤 body 不透明会自然盖住,视觉无影响)
const persistedTheme = process.platform === 'win32' ? readWindowThemeSnapshot() : null;
const isDark = process.platform === 'win32'
- ? resolveAppThemeIsDark(
- nativeTheme.shouldUseDarkColors,
- persistedTheme?.mode,
- persistedTheme?.resolvedIsDark,
- )
- : nativeTheme.shouldUseDarkColors;
+ ? resolveAppThemeIsDark(
+ nativeTheme.shouldUseDarkColors,
+ persistedTheme?.mode,
+ persistedTheme?.resolvedIsDark,
+ )
+ : nativeTheme.shouldUseDarkColors;
const bgColor =
process.platform === 'darwin' ? '#00000000' : isDark ? '#1f1f1e' : '#f8f8f6';
const winBackdropConfig = resolveVibrancyConfig(
@@ -3908,7 +3932,9 @@ const createWindow = () => {
currentApplicationMenuLocale ?? getPreferredApplicationLocale(),
);
resourceUsageWindowController.prewarm();
- remoteDesktopViewerWindows.setLocale(currentApplicationMenuLocale ?? getPreferredApplicationLocale());
+ remoteDesktopViewerWindows.setLocale(
+ currentApplicationMenuLocale ?? getPreferredApplicationLocale(),
+ );
remoteDesktopViewerWindows.prewarm();
// 右侧栏子窗口预热:复刻资源用量窗口模式,主窗口可见后后台创建
// 隐藏 BrowserWindow 并加载轻量 renderer,后续 detach 点击仅 show+focus。
@@ -4377,10 +4403,7 @@ const registerIpcHandlers = () => {
}
if (process.platform === 'win32' && config.backgroundMaterial) {
win.setBackgroundMaterial(config.backgroundMaterial);
- win.webContents.send(
- WINDOW_BACKDROP_MATERIAL_CHANGED_CHANNEL,
- config.backgroundMaterial,
- );
+ win.webContents.send(WINDOW_BACKDROP_MATERIAL_CHANGED_CHANNEL, config.backgroundMaterial);
}
win.setBackgroundColor(config.backgroundColor);
applyVibrancyToSecondaryWindows(familyId, isDark);
@@ -4389,22 +4412,21 @@ const registerIpcHandlers = () => {
ipcMain.on(
'theme:apply-vibrancy',
(event, rawPayload: unknown) => {
- assertTrustedAppRendererEvent(event);
- const payload = parseWindowThemeVibrancyPayload(rawPayload);
- if (!payload) return;
- if (payload.mode === undefined || payload.systemModeFollowsSystem === undefined) return;
- if (process.platform === 'win32') {
- writeWindowThemeSnapshot(
- payload.mode,
- payload.isDark,
- payload.familyId,
- payload.systemModeFollowsSystem,
- );
- }
- rememberResolvedAppTheme(payload.isDark);
- applyWindowVibrancy(payload.familyId, payload.isDark);
- },
- );
+ assertTrustedAppRendererEvent(event);
+ const payload = parseWindowThemeVibrancyPayload(rawPayload);
+ if (!payload) return;
+ if (payload.mode === undefined || payload.systemModeFollowsSystem === undefined) return;
+ if (process.platform === 'win32') {
+ writeWindowThemeSnapshot(
+ payload.mode,
+ payload.isDark,
+ payload.familyId,
+ payload.systemModeFollowsSystem,
+ );
+ }
+ rememberResolvedAppTheme(payload.isDark);
+ applyWindowVibrancy(payload.familyId, payload.isDark);
+ });
ipcMain.on('get-app-version', (event) => {
event.returnValue = app.getVersion();
@@ -4649,14 +4671,15 @@ const registerIpcHandlers = () => {
return compactionWire();
});
ipcMain.handle(MAKER_IPC_INVOKE.COMPACTION_SET_PCT, async (event, pct: unknown, owner: unknown) => {
- assertTrustedAppRendererEvent(event);
- if (typeof pct !== 'number' || !Number.isFinite(pct)) {
- throwIpcError('INVALID_PARAMS', 'compaction pct required (number)');
- }
- assertCompactionMutationOwner(owner);
- writeCompactionPct(pct);
- return compactionWire();
- });
+ assertTrustedAppRendererEvent(event);
+ if (typeof pct !== 'number' || !Number.isFinite(pct)) {
+ throwIpcError('INVALID_PARAMS', 'compaction pct required (number)');
+ }
+ assertCompactionMutationOwner(owner);
+ writeCompactionPct(pct);
+ return compactionWire();
+ },
+ );
ipcMain.handle(MAKER_IPC_INVOKE.PI_COMPACTION_GET_PCT, async (event) => {
assertTrustedAppRendererEvent(event);
@@ -4673,14 +4696,15 @@ const registerIpcHandlers = () => {
return piCompactionWire();
});
ipcMain.handle(MAKER_IPC_INVOKE.PI_COMPACTION_SET_PCT, async (event, pct: unknown, owner: unknown) => {
- assertTrustedAppRendererEvent(event);
- if (typeof pct !== 'number' || !Number.isFinite(pct)) {
- throwIpcError('INVALID_PARAMS', 'pi compaction pct required (number)');
- }
- assertCompactionMutationOwner(owner);
- writePiCompactionPct(pct);
- return piCompactionWire();
- });
+ assertTrustedAppRendererEvent(event);
+ if (typeof pct !== 'number' || !Number.isFinite(pct)) {
+ throwIpcError('INVALID_PARAMS', 'pi compaction pct required (number)');
+ }
+ assertCompactionMutationOwner(owner);
+ writePiCompactionPct(pct);
+ return piCompactionWire();
+ },
+ );
// Window behavior —— swallowActivationClick 保持 renderer 运行时事实标准;
// Windows / Linux close behavior 由 main 读写并执行。
@@ -4796,23 +4820,22 @@ const registerIpcHandlers = () => {
ipcMain.handle(
MAKER_IPC_INVOKE.CHAT_EMBEDDING_RESET,
async (_e, owner: unknown) => {
- assertChatEmbeddingMutationOwner(owner);
- try {
- await resetChatEmbeddingSettings(chatEmbeddingDefaultContext());
- } catch (error) {
- await scheduleChatEmbeddingRuntimeReconcile();
- if (!isIpcError(error)) {
- createSchedulerLogger('chat-embedding-settings').error(
- 'Failed to reset chat embedding settings',
- { error: error instanceof Error ? error.message : String(error) },
- );
- }
- rethrowChatEmbeddingPersistError(error, 'Failed to reset chat embedding settings');
- }
+ assertChatEmbeddingMutationOwner(owner);
+ try {
+ await resetChatEmbeddingSettings(chatEmbeddingDefaultContext());
+ } catch (error) {
await scheduleChatEmbeddingRuntimeReconcile();
- return chatEmbeddingWire();
- },
- );
+ if (!isIpcError(error)) {
+ createSchedulerLogger('chat-embedding-settings').error(
+ 'Failed to reset chat embedding settings',
+ { error: error instanceof Error ? error.message : String(error) },
+ );
+ }
+ rethrowChatEmbeddingPersistError(error, 'Failed to reset chat embedding settings');
+ }
+ await scheduleChatEmbeddingRuntimeReconcile();
+ return chatEmbeddingWire();
+ });
// Git safety settings IPC —— store 独立于 Maker 单例,提前注册以便 renderer
// 启动时同步本地镜像。SET 只影响之后的 turn 边界,已运行 turn 不追溯。
@@ -4886,32 +4909,33 @@ const registerIpcHandlers = () => {
return { ok: true, authorized: hasClaudeAiOAuth() };
});
ipcMain.handle(MAKER_IPC_INVOKE.CLAUDE_OAUTH_LOGOUT, async (event, ownerScope?: { dataOwnerId: string | null; ownerGeneration: number }) => {
- assertTrustedAppRendererEvent(event);
- const active = getActiveAppSession();
- const owner = activeOwnerScopeKey();
+ assertTrustedAppRendererEvent(event);
+ const active = getActiveAppSession();
+ const owner = activeOwnerScopeKey();
if (isAppSessionBoundaryPending() || (ownerScope && (ownerScope.dataOwnerId !== active.dataOwnerId || ownerScope.ownerGeneration !== active.generation))) {
- throwIpcError('INVALID_PARAMS', 'Provider owner changed');
- }
- // Cancel pending Cindy login/refresh before revoking the binding; keep native credentials.
- try {
- cancelClaudeOAuthLogin();
- await disconnectClaudeAiOAuth();
+ throwIpcError('INVALID_PARAMS', 'Provider owner changed');
+ }
+ // Cancel pending Cindy login/refresh before revoking the binding; keep native credentials.
+ try {
+ cancelClaudeOAuthLogin();
+ await disconnectClaudeAiOAuth();
if (owner !== activeOwnerScopeKey() || isAppSessionBoundaryPending()) return { authorized: false };
- resetProviderModelAutoRefreshCooldowns('anthropic');
- } catch (err) {
- throwIpcError(
- 'INTERNAL',
- `claude oauth logout failed: ${err instanceof Error ? err.message : String(err)}`,
- );
- }
- await broadcastClaudeAuthStateChanged();
+ resetProviderModelAutoRefreshCooldowns('anthropic');
+ } catch (err) {
+ throwIpcError(
+ 'INTERNAL',
+ `claude oauth logout failed: ${err instanceof Error ? err.message : String(err)}`,
+ );
+ }
+ await broadcastClaudeAuthStateChanged();
if (owner !== activeOwnerScopeKey() || isAppSessionBoundaryPending()) return { authorized: false };
- // Binding revoked: read() clears the Cindy quota snapshot and broadcasts null.
- syncClaudeSubscriptionUsageForAuthChange();
- // 模型清单动态发现:登出完成前清空清单 + 删磁盘缓存,并等待旧 SDK 写盘收尾。
- await clearAnthropicDiscoveredModels();
- return { authorized: hasClaudeAiOAuth() };
- });
+ // Binding revoked: read() clears the Cindy quota snapshot and broadcasts null.
+ syncClaudeSubscriptionUsageForAuthChange();
+ // 模型清单动态发现:登出完成前清空清单 + 删磁盘缓存,并等待旧 SDK 写盘收尾。
+ await clearAnthropicDiscoveredModels();
+ return { authorized: hasClaudeAiOAuth() };
+ },
+ );
ipcMain.handle(MAKER_IPC_INVOKE.CLAUDE_OAUTH_CANCEL, async (event, loginKey?: string) => {
assertTrustedAppRendererEvent(event);
cancelClaudeOAuthLogin(loginKey);
@@ -4932,7 +4956,10 @@ const registerIpcHandlers = () => {
setXaiAuthInvalidatedHandler((providerId) => {
if (providerId !== 'xai') {
void clearSubscriptionAccountDiscoveredModels(providerId);
- void syncSubscriptionAccountUsage(providerId).then(broadcastXaiAuthStateChanged, broadcastXaiAuthStateChanged);
+ void syncSubscriptionAccountUsage(providerId).then(
+ broadcastXaiAuthStateChanged,
+ broadcastXaiAuthStateChanged,
+ );
return;
}
resetProviderModelAutoRefreshCooldowns('xai');
@@ -4961,7 +4988,7 @@ const registerIpcHandlers = () => {
// 新凭证在 runGrokOAuthLogin 返回前已经落盘。先同步关掉旧周用量读取窗口,
// 再去做模型磁盘清理等 await,避免换号间隙里 IPC read 仍返回账号 A 的快照。
await clearXaiSubscriptionUsageSnapshot();
- if (owner !== activeOwnerScopeKey() || isAppSessionBoundaryPending()) return { ok: false, reason: 'login_cancelled', authorized: false };
+ if (owner !== activeOwnerScopeKey() || isAppSessionBoundaryPending()) return { ok: false, reason: 'login_cancelled', authorized: false };
// 登录可直接覆盖旧 SuperGrok 账号:先清旧世代内存,再直接读新账号官方清单。
// 这里不能先恢复同一 Cindy owner 的磁盘 LKG,否则 A→B 重登会短暂展示 A 的成员。
clearXaiDiscoveredModels();
@@ -4988,36 +5015,37 @@ const registerIpcHandlers = () => {
return { ok: false, reason: result.reason ?? 'unknown', authorized: hasGrokOAuthLogin() };
});
ipcMain.handle(MAKER_IPC_INVOKE.XAI_OAUTH_LOGOUT, async (event, ownerScope?: { dataOwnerId: string | null; ownerGeneration: number }) => {
- assertTrustedAppRendererEvent(event);
- const active = getActiveAppSession();
- const owner = activeOwnerScopeKey();
+ assertTrustedAppRendererEvent(event);
+ const active = getActiveAppSession();
+ const owner = activeOwnerScopeKey();
if (isAppSessionBoundaryPending() || (ownerScope && (ownerScope.dataOwnerId !== active.dataOwnerId || ownerScope.ownerGeneration !== active.generation))) {
- throwIpcError('INVALID_PARAMS', 'Provider owner changed');
- }
- try {
- cancelGrokOAuthLogin();
- logoutGrok();
- const presentation = retainProviderPresentationAfterAuthChange('xai');
- resetProviderModelAutoRefreshCooldowns('xai');
- await clearXaiSubscriptionUsageSnapshot();
- await presentation;
+ throwIpcError('INVALID_PARAMS', 'Provider owner changed');
+ }
+ try {
+ cancelGrokOAuthLogin();
+ logoutGrok();
+ const presentation = retainProviderPresentationAfterAuthChange('xai');
+ resetProviderModelAutoRefreshCooldowns('xai');
+ await clearXaiSubscriptionUsageSnapshot();
+ await presentation;
if (owner !== activeOwnerScopeKey() || isAppSessionBoundaryPending()) return { ok: false, reason: 'login_cancelled', authorized: false };
- clearXaiDiscoveredModels();
- clearXaiMediaModels();
- } catch (err) {
- throwIpcError(
- 'INTERNAL',
- `xai oauth logout failed: ${err instanceof Error ? err.message : String(err)}`,
- );
- }
- // 登出后同步广播给其它窗口,让已挂载的 useProviders 立刻重拉连接态;
- // 并清掉账号级限流快照 —— 登出后没有下一个成功响应来覆盖,不清会一直挂着旧账号余量。
- clearXaiRateLimitSnapshot();
- await syncXaiSubscriptionUsageForAuthChange();
- if (owner !== activeOwnerScopeKey() || isAppSessionBoundaryPending()) return { ok: false, reason: 'login_cancelled', authorized: false };
- broadcastXaiAuthStateChanged();
- return { authorized: hasGrokOAuthLogin() };
- });
+ clearXaiDiscoveredModels();
+ clearXaiMediaModels();
+ } catch (err) {
+ throwIpcError(
+ 'INTERNAL',
+ `xai oauth logout failed: ${err instanceof Error ? err.message : String(err)}`,
+ );
+ }
+ // 登出后同步广播给其它窗口,让已挂载的 useProviders 立刻重拉连接态;
+ // 并清掉账号级限流快照 —— 登出后没有下一个成功响应来覆盖,不清会一直挂着旧账号余量。
+ clearXaiRateLimitSnapshot();
+ await syncXaiSubscriptionUsageForAuthChange();
+ if (owner !== activeOwnerScopeKey() || isAppSessionBoundaryPending()) return { ok: false, reason: 'login_cancelled', authorized: false };
+ broadcastXaiAuthStateChanged();
+ return { authorized: hasGrokOAuthLogin() };
+ },
+ );
ipcMain.handle(MAKER_IPC_INVOKE.XAI_OAUTH_CANCEL, async () => {
cancelGrokOAuthLogin();
return { authorized: hasGrokOAuthLogin() };
@@ -5611,18 +5639,26 @@ const registerIpcHandlers = () => {
): Promise<void> => {
assertTrustedAppRendererEvent(event);
builtinApiKeyStore(builtinApiKeyDeps, providerId, value);
- await retainProviderPresentationAfterAuthChange(builtinApiKeyPresentationId(providerId as string));
+ await retainProviderPresentationAfterAuthChange(
+ builtinApiKeyPresentationId(providerId as string),
+ );
},
);
ipcMain.handle(
'builtin-api-key-remove',
- async (event: Electron.IpcMainInvokeEvent, providerId: unknown, ownerScope?: { dataOwnerId: string | null; ownerGeneration: number }): Promise<void> => {
+ async (
+ event: Electron.IpcMainInvokeEvent,
+ providerId: unknown,
+ ownerScope?: { dataOwnerId: string | null; ownerGeneration: number },
+ ): Promise<void> => {
assertTrustedAppRendererEvent(event);
const active = getActiveAppSession();
if (isAppSessionBoundaryPending() || (ownerScope && (ownerScope.dataOwnerId !== active.dataOwnerId || ownerScope.ownerGeneration !== active.generation))) throwIpcError('INVALID_PARAMS', 'Provider owner changed');
builtinApiKeyRemove(builtinApiKeyDeps, providerId);
- await retainProviderPresentationAfterAuthChange(builtinApiKeyPresentationId(providerId as string));
+ await retainProviderPresentationAfterAuthChange(
+ builtinApiKeyPresentationId(providerId as string),
+ );
},
);
@@ -5920,10 +5956,10 @@ const registerIpcHandlers = () => {
// Scope to this process: `pi-agent-home` is shared with a concurrent
// dev/packaged/`--passive` instance, and its running Subagents are not
// a reason to hold up *our* quit.
- anyPiSubagentRunning: () => hasActivePiSubagentRunsSync(
- path.join(app.getPath('userData'), 'pi-agent-home'),
- { hostPid: process.pid },
- ),
+ anyPiSubagentRunning: () =>
+ hasActivePiSubagentRunsSync(path.join(app.getPath('userData'), 'pi-agent-home'), {
+ hostPid: process.pid,
+ }),
// script 模式 / pre-run hook 阶段的 run 不创建 session,内存来源看不到它们。
anySchedulerRunRunning: () =>
readUpdateRelaunchScheduleBusy(getScheduleStorageIfInitialized()),
@@ -6066,7 +6102,10 @@ const registerIpcHandlers = () => {
startReadyWorktreeMaintenance();
// 删除 worktree 时因拿不到全局 safe.directory 锁而落盘的残留路径, 启动期补清。
void reconcilePendingSafeDirectoryCleanups().catch((err) => {
- console.error('[bootstrap-electron] safe.directory cleanup reconcile failed (non-fatal):', err);
+ console.error(
+ '[bootstrap-electron] safe.directory cleanup reconcile failed (non-fatal):',
+ err,
+ );
});
// 同窗口的 shadow savepoint 对账:owning session 已删除的孤儿保存点链
// (refs/cindy/savepoints/<sid>)启动期补删。fire-and-forget,不阻塞启动。
@@ -6273,8 +6312,10 @@ const registerIpcHandlers = () => {
// Mail links are restricted to the fixed billing inbox. Renderer content may
// provide the localized subject/body, but it must not choose a recipient or
// use mailto as a general-purpose external scheme.
- const isBillingMailto =
- isAllowedBillingMailtoRequest(url, isTrustedAppRendererEvent(event));
+ const isBillingMailto = isAllowedBillingMailtoRequest(
+ url,
+ isTrustedAppRendererEvent(event),
+ );
const isAllowedSystemSettingsUrl =
process.platform === 'darwin' && allowedSystemSettingsUrls.has(url);
if (!isWebUrl && !isBillingMailto && !isAllowedSystemSettingsUrl) {
@@ -7341,19 +7382,30 @@ const registerIpcHandlers = () => {
ipcMain.handle(
'app:open-cindy-make-tools-dir',
async (event): Promise<{ success: boolean }> => {
- assertTrustedAppRendererEvent(event);
- return openMakeToolsDirectory(app.getPath('userData'), {
- openPath: (directory) => shell.openPath(directory),
- });
- },
- );
+ assertTrustedAppRendererEvent(event);
+ return openMakeToolsDirectory(app.getPath('userData'), {
+ openPath: (directory) => shell.openPath(directory),
+ });
+ });
ipcMain.handle('app:get-cindy-make-source-status', async (event) => {
assertTrustedAppRendererEvent(event);
- return readCurrentCindySourceStatus(makeSourceRoot(app.getPath('userData')));
+ const userData = app.getPath('userData');
+ let env;
+ try {
+ env = await createMakeToolchainEnvironment(userData);
+ } catch {
+ // The persisted status remains usable when tool discovery is unavailable.
+ }
+ return readCurrentCindySourceStatus(makeSourceRoot(userData), env);
});
// 源码准备是全局单例:进度广播给所有窗口,任意窗口都能停止它。
subscribeCindySourceStatus(broadcastCindyMakeSourceStatus);
+ cindyMakeManager.subscribe(broadcastCindyMakeState);
+ ipcMain.handle('app:get-cindy-make-state', async (event) => {
+ assertTrustedAppRendererEvent(event);
+ return cindyMakeManager.getState();
+ });
ipcMain.handle('app:cancel-cindy-make-source', async (event): Promise<{ success: boolean }> => {
assertTrustedAppRendererEvent(event);
return { success: cancelCindySourcePreparation() };
@@ -7362,12 +7414,11 @@ const registerIpcHandlers = () => {
ipcMain.handle(
'app:open-cindy-make-source-dir',
async (event): Promise<{ success: boolean }> => {
- assertTrustedAppRendererEvent(event);
- return openMakeSourceDirectory(app.getPath('userData'), {
- openPath: (directory) => shell.openPath(directory),
- });
- },
- );
+ assertTrustedAppRendererEvent(event);
+ return openMakeSourceDirectory(app.getPath('userData'), {
+ openPath: (directory) => shell.openPath(directory),
+ });
+ });
// 个人版制作任务的独立开发目录:从个人版基线建任务分支 + worktree 并安装依赖。
// 只认 runId 形状;路径全部由 main 从 userData 派生,renderer 只拿回结果。
@@ -7379,8 +7430,14 @@ const registerIpcHandlers = () => {
const userData = app.getPath('userData');
const env = await createMakeToolchainEnvironment(userData);
try {
- return await prepareCindyMakeWorkspace(userData, rawRunId, AbortSignal.timeout(20 * 60_000), {
- processEnvironment: env.processEnvironment(),
+ const signal = AbortSignal.timeout(20 * 60_000);
+ const processEnvironment = await resolveMakeToolEnvironment(
+ env,
+ ['git', 'node', 'pnpm', 'python'],
+ signal,
+ );
+ return await prepareCindyMakeWorkspace(userData, rawRunId, signal, {
+ processEnvironment,
});
} catch (error) {
const code = (error as { code?: unknown } | null)?.code;
@@ -7967,9 +8024,9 @@ const registerIpcHandlers = () => {
};
const ownerWindow = BrowserWindow.getFocusedWindow() ?? mainWindowRef;
const result = ownerWindow && !ownerWindow.isDestroyed()
- ? await dialog.showOpenDialog(ownerWindow, options)
- : await dialog.showOpenDialog(options);
- return result.canceled ? null : result.filePaths[0] ?? null;
+ ? await dialog.showOpenDialog(ownerWindow, options)
+ : await dialog.showOpenDialog(options);
+ return result.canceled ? null : (result.filePaths[0] ?? null);
},
confirmActiveTaskCleanup: async ({ backupEnabled }) => {
const activeTaskWarning = t(
@@ -7995,8 +8052,8 @@ const registerIpcHandlers = () => {
};
const ownerWindow = BrowserWindow.getFocusedWindow() ?? mainWindowRef;
const result = ownerWindow && !ownerWindow.isDestroyed()
- ? await dialog.showMessageBox(ownerWindow, options)
- : await dialog.showMessageBox(options);
+ ? await dialog.showMessageBox(ownerWindow, options)
+ : await dialog.showMessageBox(options);
return result.response === 0;
},
confirmWithoutBackup: async () => {
@@ -8015,8 +8072,8 @@ const registerIpcHandlers = () => {
};
const ownerWindow = BrowserWindow.getFocusedWindow() ?? mainWindowRef;
const result = ownerWindow && !ownerWindow.isDestroyed()
- ? await dialog.showMessageBox(ownerWindow, options)
- : await dialog.showMessageBox(options);
+ ? await dialog.showMessageBox(ownerWindow, options)
+ : await dialog.showMessageBox(options);
return result.response === 0;
},
revealFile: async (filePath) => {
@@ -8965,7 +9022,11 @@ app.on('ready', async () => {
attemptStartScheduler();
attemptStartEmbeddingHost();
});
- accountProviderReadinessArm.publish(userId, startProviderReadiness, resumeIncompleteDiscovery);
+ accountProviderReadinessArm.publish(
+ userId,
+ startProviderReadiness,
+ resumeIncompleteDiscovery,
+ );
if (makerProviderRefreshConfigured) startProviderReadiness();
else
startPendingAccountProviderReadiness = { ownerId: userId, start: startProviderReadiness };
@@ -9835,8 +9896,12 @@ function startReadyWorktreeMaintenance(): void {
const db = tryGetDbClient();
if (worktreeRuntimeCloseReady && getMakerIfReady() && db && db !== lastWorktreeMaintenanceDb) {
lastWorktreeMaintenanceDb = db;
- void auditRegisteredWorktrees().catch((error) => dbClientLog.warn('worktree audit postponed', error));
- void WorktreePool.recoverPool().catch((error) => dbClientLog.warn('worktree pool recovery postponed', error));
+ void auditRegisteredWorktrees().catch((error) =>
+ dbClientLog.warn('worktree audit postponed', error),
+ );
+ void WorktreePool.recoverPool().catch((error) =>
+ dbClientLog.warn('worktree pool recovery postponed', error),
+ );
}
}
diff --git a/apps/desktop/src/main/cindy-make/__tests__/doctorCommand.test.ts b/apps/desktop/src/main/cindy-make/__tests__/doctorCommand.test.ts
index 6f6552c857..0e597a588f 100644
--- a/apps/desktop/src/main/cindy-make/__tests__/doctorCommand.test.ts
+++ b/apps/desktop/src/main/cindy-make/__tests__/doctorCommand.test.ts
@@ -1,9 +1,20 @@
import { describe, expect, it, vi } from 'vitest';
import { createMakeDoctorCommand } from '../doctorCommand.js';
+import { cindyMakeManager } from '../manager.js';
import { DesktopCommandRegistry } from '../../commands/registry.js';
import type { MakeDoctorEnvironment } from '../doctor.js';
import { MAKE_DOCTOR_CHECK_IDS, type MakeDoctorReport } from '../../../shared/cindyMakeDoctor.js';
+function deferred<T>() {
+ let resolve!: (value: T) => void;
+ let reject!: (reason: unknown) => void;
+ const promise = new Promise<T>((resolvePromise, rejectPromise) => {
+ resolve = resolvePromise;
+ reject = rejectPromise;
+ });
+ return { promise, resolve, reject };
+}
+
function harness() {
const environment = vi.fn((): MakeDoctorEnvironment => ({
platform: 'linux',
@@ -51,9 +62,7 @@ describe('/cindy-make-doctor command', () => {
});
const pending = command.execute({ senderWebContentsId: 1, doctorRunId: 'first' });
await vi.waitFor(() => expect(prepare).toHaveBeenCalledTimes(1));
- await expect(
- command.execute({ senderWebContentsId: 2, doctorRunId: 'second' }),
- ).rejects.toThrow('already running');
+ const attached = command.execute({ senderWebContentsId: 2, doctorRunId: 'second' });
// A source-only run is global and may coexist with tool provisioning: it is
// not rejected as busy but runs to its own outcome (unavailable here, so failed).
await expect(
@@ -65,6 +74,9 @@ describe('/cindy-make-doctor command', () => {
).resolves.toMatchObject({ doctorReport: { runId: 'source', status: 'failed' } });
finish({ runId: 'first', mode: 'prepare', status: 'completed', checks: [] } as never);
await expect(pending).resolves.toMatchObject({ doctorReport: { mode: 'prepare' } });
+ await expect(attached).resolves.toMatchObject({
+ doctorReport: { runId: 'second', mode: 'prepare' },
+ });
});
it('is discoverable and returns the same terminal snapshot as progress', async () => {
const { registry, publish } = harness();
@@ -185,7 +197,10 @@ describe('Make upstream workflow', () => {
function workflow(report = ready()) {
const { environment } = harness();
const publish = vi.fn();
- const searchUpstream = vi.fn(async () => ({ status: 'notFound' as const, items: [] }));
+ const searchUpstream = vi.fn(async (_request: string, _signal: AbortSignal) => ({
+ status: 'notFound' as const,
+ items: [],
+ }));
const prepare = vi.fn(async (_id, _env, _signal, publishReport) => {
publishReport(report);
return report;
@@ -211,7 +226,7 @@ describe('Make upstream workflow', () => {
allowInstallTest: () => true,
description: () => '',
});
- return { command, publish, searchUpstream, prepare, prepareSource };
+ return { command, environment, publish, searchUpstream, prepare, prepareSource };
}
it('automatically prepares source after checks, then searches and retains all step results', async () => {
const h = workflow();
@@ -253,11 +268,314 @@ describe('Make upstream workflow', () => {
expect(await h.command.execute({ senderWebContentsId: 1, makeRequest: '' })).toMatchObject({
doctorReport: { upstream: { status: 'needsRequest' } },
});
- const result = await h.command.execute({ senderWebContentsId: 1 });
+ const result = await h.command.execute({ senderWebContentsId: 1, doctorRunId: 'make' });
expect(result).toEqual({ success: true, doctorReport: ready() });
expect(h.searchUpstream).not.toHaveBeenCalled();
expect(h.prepareSource).not.toHaveBeenCalled();
});
+ it.each(['settings', 'workflow'])(
+ 'shares only the environment when %s starts first',
+ async (first) => {
+ const setup = workflow();
+ const environment = deferred<MakeDoctorReport>();
+ const source = deferred<MakeDoctorReport>();
+ setup.prepare.mockImplementationOnce(() => environment.promise);
+ setup.prepareSource.mockImplementationOnce(() => source.promise);
+ const startSettings = () =>
+ setup.command.execute({
+ senderWebContentsId: 1,
+ doctorRunId: 'settings-shared',
+ });
+ const startWorkflow = () =>
+ setup.command.execute({
+ senderWebContentsId: 2,
+ doctorRunId: 'workflow-shared',
+ makeRequest: 'scrolling',
+ });
+ const firstRun = first === 'settings' ? startSettings() : startWorkflow();
+ await vi.waitFor(() => expect(setup.prepare).toHaveBeenCalledOnce());
+ const secondRun = first === 'settings' ? startWorkflow() : startSettings();
+ const settingsRun = first === 'settings' ? firstRun : secondRun;
+ const workflowRun = first === 'workflow' ? firstRun : secondRun;
+ let workflowFinished = false;
+ void Promise.resolve(workflowRun).then(() => {
+ workflowFinished = true;
+ });
+ environment.resolve(ready());
+ await expect(settingsRun).resolves.toMatchObject({
+ doctorReport: { runId: 'settings-shared', status: 'completed', checks: ready().checks },
+ });
+ await vi.waitFor(() => expect(setup.prepareSource).toHaveBeenCalledOnce());
+ expect(workflowFinished).toBe(false);
+ expect(setup.environment).toHaveBeenCalledOnce();
+ expect(setup.prepare).toHaveBeenCalledOnce();
+ expect(setup.prepareSource.mock.calls[0][1]).toBe(setup.prepare.mock.calls[0][1]);
+ const snapshot = cindyMakeManager.getState().environmentPrepare;
+ expect(snapshot).toMatchObject({ active: false, report: { status: 'completed' } });
+ expect(snapshot?.report.source).toBeUndefined();
+ expect(snapshot?.report.upstream).toBeUndefined();
+ expect(
+ setup.publish.mock.calls
+ .filter(([context]) => context.senderWebContentsId === 2)
+ .every(([, report]) => report.runId === 'workflow-shared' && report.status === 'running'),
+ ).toBe(true);
+ source.resolve({
+ ...ready(),
+ checks: [],
+ source: { status: 'ready', path: 'managed-source' },
+ });
+ await expect(workflowRun).resolves.toMatchObject({
+ doctorReport: {
+ runId: 'workflow-shared',
+ status: 'completed',
+ source: { status: 'ready' },
+ upstream: { status: 'notFound' },
+ },
+ });
+ expect(setup.searchUpstream).toHaveBeenCalledWith('scrolling', expect.any(AbortSignal));
+ expect(cindyMakeManager.getState().environmentPrepare).toEqual(snapshot);
+ },
+ );
+
+ it('continues two distinct requests independently after one shared preparation', async () => {
+ const setup = workflow();
+ const environment = deferred<MakeDoctorReport>();
+ setup.prepare.mockImplementationOnce(() => environment.promise);
+ setup.searchUpstream.mockImplementation(async (request: string) => ({
+ status: 'notFound',
+ items: [],
+ terms: [request],
+ }));
+ const first = setup.command.execute({
+ senderWebContentsId: 1,
+ doctorRunId: 'scrolling',
+ makeRequest: 'fix scrolling',
+ });
+ await vi.waitFor(() => expect(setup.prepare).toHaveBeenCalledOnce());
+ const second = setup.command.execute({
+ senderWebContentsId: 2,
+ doctorRunId: 'keyboard',
+ makeRequest: 'fix keyboard',
+ });
+ environment.resolve(ready());
+ const results = await Promise.all([first, second]);
+ expect(results).toMatchObject([
+ { doctorReport: { runId: 'scrolling', upstream: { terms: ['fix scrolling'] } } },
+ { doctorReport: { runId: 'keyboard', upstream: { terms: ['fix keyboard'] } } },
+ ]);
+ expect(setup.environment).toHaveBeenCalledOnce();
+ expect(setup.prepare).toHaveBeenCalledOnce();
+ expect(setup.prepareSource).toHaveBeenCalledTimes(2);
+ expect(setup.prepareSource.mock.calls.map(([runId]) => runId).sort()).toEqual([
+ 'keyboard',
+ 'scrolling',
+ ]);
+ expect(
+ setup.prepareSource.mock.calls.every(([, env]) => env === setup.prepare.mock.calls[0][1]),
+ ).toBe(true);
+ expect(setup.searchUpstream).toHaveBeenCalledTimes(2);
+ for (const [context, report] of setup.publish.mock.calls) {
+ expect(report.runId).toBe(context.doctorRunId);
+ if (report.upstream?.terms) expect(report.upstream.terms).toEqual([context.makeRequest]);
+ }
+ });
+
+ it.each(['canonical', 'attached'])(
+ 'allows a trusted settings observer or attached caller to explicitly cancel using %s',
+ async (target) => {
+ const setup = workflow();
+ setup.prepare.mockImplementationOnce(async (_runId, _env, signal: AbortSignal) => {
+ await new Promise<void>((resolve) =>
+ signal.addEventListener('abort', () => resolve(), { once: true }),
+ );
+ return ready();
+ });
+ const first = setup.command.execute({ senderWebContentsId: 1, doctorRunId: 'canonical' });
+ await vi.waitFor(() => expect(setup.prepare).toHaveBeenCalledOnce());
+ const attached = setup.command.execute({
+ senderWebContentsId: 2,
+ doctorRunId: 'attached',
+ makeRequest: 'scrolling',
+ });
+ const snapshot = cindyMakeManager.getState().environmentPrepare;
+ expect(snapshot).toMatchObject({ active: true, report: { runId: 'canonical' } });
+ await setup.command.execute({
+ senderWebContentsId: target === 'canonical' ? 99 : 2,
+ doctorRunId: target === 'canonical' ? snapshot!.report.runId : 'attached',
+ doctorAction: 'cancel',
+ });
+ await expect(first).resolves.toMatchObject({ doctorReport: { status: 'cancelled' } });
+ await expect(attached).resolves.toMatchObject({
+ doctorReport: { runId: 'attached', status: 'cancelled' },
+ });
+ expect(setup.prepareSource).not.toHaveBeenCalled();
+ expect(setup.searchUpstream).not.toHaveBeenCalled();
+ expect(cindyMakeManager.getState().environmentPrepare).toMatchObject({
+ active: false,
+ report: { status: 'cancelled' },
+ });
+ await expect(
+ setup.command.execute({ senderWebContentsId: 2, doctorRunId: 'attached' }),
+ ).resolves.toMatchObject({ doctorReport: { status: 'completed' } });
+ },
+ );
+
+ it.each([{ remoteHostId: 'ssh' }, { deviceId: 'device' }, { senderWebContentsId: undefined }])(
+ 'does not admit an untrusted or remote cancellation context: %j',
+ async (extra) => {
+ const setup = workflow();
+ const environment = deferred<MakeDoctorReport>();
+ setup.prepare.mockImplementationOnce(() => environment.promise);
+ const pending = setup.command.execute({
+ senderWebContentsId: 1,
+ doctorRunId: 'trusted-only',
+ });
+ await vi.waitFor(() => expect(setup.prepare).toHaveBeenCalledOnce());
+ try {
+ await expect(
+ setup.command.execute({
+ senderWebContentsId: 99,
+ doctorRunId: 'trusted-only',
+ doctorAction: 'cancel',
+ ...extra,
+ }),
+ ).rejects.toThrow();
+ expect(setup.prepare.mock.calls[0][2].aborted).toBe(false);
+ } finally {
+ environment.resolve(ready());
+ await pending;
+ }
+ },
+ );
+
+ it('shares environment failure without starting either workflow and allows a retry', async () => {
+ const setup = workflow();
+ const environment = deferred<MakeDoctorReport>();
+ setup.prepare.mockImplementationOnce(() => environment.promise);
+ const first = setup.command.execute({
+ senderWebContentsId: 1,
+ doctorRunId: 'failed-first',
+ makeRequest: 'scrolling',
+ });
+ await vi.waitFor(() => expect(setup.prepare).toHaveBeenCalledOnce());
+ const second = setup.command.execute({
+ senderWebContentsId: 2,
+ doctorRunId: 'failed-second',
+ makeRequest: 'keyboard',
+ });
+ environment.reject(new Error('tool preparation failed'));
+ await expect(first).resolves.toMatchObject({ doctorReport: { status: 'failed' } });
+ await expect(second).resolves.toMatchObject({ doctorReport: { status: 'failed' } });
+ expect(setup.prepareSource).not.toHaveBeenCalled();
+ await expect(
+ setup.command.execute({
+ senderWebContentsId: 2,
+ doctorRunId: 'failed-second',
+ makeRequest: 'retry',
+ }),
+ ).resolves.toMatchObject({
+ doctorReport: { status: 'completed', upstream: { status: 'notFound' } },
+ });
+ });
+
+ it('shares an environment timeout with attached callers and releases the operation', async () => {
+ vi.useFakeTimers();
+ try {
+ const setup = workflow();
+ setup.prepare.mockImplementationOnce(async (_runId, _env, signal: AbortSignal) => {
+ await new Promise<void>((resolve) =>
+ signal.addEventListener('abort', () => resolve(), { once: true }),
+ );
+ return ready();
+ });
+ const first = setup.command.execute({ senderWebContentsId: 1, doctorRunId: 'timeout-first' });
+ await vi.waitFor(() => expect(setup.prepare).toHaveBeenCalledOnce());
+ const attached = setup.command.execute({
+ senderWebContentsId: 2,
+ doctorRunId: 'timeout-attached',
+ makeRequest: 'scrolling',
+ });
+ await vi.advanceTimersByTimeAsync(20 * 60_000);
+ await expect(first).resolves.toMatchObject({ doctorReport: { status: 'failed' } });
+ await expect(attached).resolves.toMatchObject({ doctorReport: { status: 'failed' } });
+ expect(setup.prepareSource).not.toHaveBeenCalled();
+ expect(setup.searchUpstream).not.toHaveBeenCalled();
+ expect(cindyMakeManager.getState().environmentPrepare).toMatchObject({
+ active: false,
+ report: { status: 'failed' },
+ });
+ await expect(
+ setup.command.execute({
+ senderWebContentsId: 2,
+ doctorRunId: 'timeout-attached',
+ makeRequest: 'retry',
+ }),
+ ).resolves.toMatchObject({
+ doctorReport: { status: 'completed', upstream: { status: 'notFound' } },
+ });
+ } finally {
+ vi.useRealTimers();
+ }
+ });
+
+ it('cancels one workflow continuation without cancelling the other request', async () => {
+ const setup = workflow();
+ const environment = deferred<MakeDoctorReport>();
+ const firstSearch = deferred<{ status: 'notFound'; items: never[] }>();
+ const secondSearch = deferred<{ status: 'notFound'; items: never[] }>();
+ setup.prepare.mockImplementationOnce(() => environment.promise);
+ setup.searchUpstream.mockImplementation((request: string) =>
+ request === 'scrolling' ? firstSearch.promise : secondSearch.promise,
+ );
+ const first = setup.command.execute({
+ senderWebContentsId: 1,
+ doctorRunId: 'private-first',
+ makeRequest: 'scrolling',
+ });
+ await vi.waitFor(() => expect(setup.prepare).toHaveBeenCalledOnce());
+ const second = setup.command.execute({
+ senderWebContentsId: 2,
+ doctorRunId: 'private-second',
+ makeRequest: 'keyboard',
+ });
+ environment.resolve(ready());
+ await vi.waitFor(() => expect(setup.searchUpstream).toHaveBeenCalledTimes(2));
+ await expect(
+ setup.command.execute({
+ senderWebContentsId: 99,
+ doctorRunId: 'private-first',
+ doctorAction: 'cancel',
+ }),
+ ).rejects.toThrow('another window');
+ await setup.command.execute({
+ senderWebContentsId: 1,
+ doctorRunId: 'private-first',
+ doctorAction: 'cancel',
+ });
+ await expect(first).resolves.toMatchObject({
+ doctorReport: {
+ runId: 'private-first',
+ status: 'cancelled',
+ upstream: { status: 'cancelled' },
+ },
+ });
+ const secondSignal = setup.searchUpstream.mock.calls.find(
+ ([request]) => request === 'keyboard',
+ )?.[1];
+ expect(secondSignal?.aborted).toBe(false);
+ secondSearch.resolve({ status: 'notFound', items: [] });
+ await expect(second).resolves.toMatchObject({
+ doctorReport: {
+ runId: 'private-second',
+ status: 'completed',
+ upstream: { status: 'notFound' },
+ },
+ });
+ const publishCount = setup.publish.mock.calls.length;
+ firstSearch.resolve({ status: 'notFound', items: [] });
+ await Promise.resolve();
+ expect(setup.publish).toHaveBeenCalledTimes(publishCount);
+ });
it('waits for each step before starting the next and preserves environment checks during checkout', async () => {
const h = workflow();
let finishEnvironment!: (report: MakeDoctorReport) => void;
diff --git a/apps/desktop/src/main/cindy-make/__tests__/manager.test.ts b/apps/desktop/src/main/cindy-make/__tests__/manager.test.ts
new file mode 100644
index 0000000000..fc9e2e61a9
--- /dev/null
+++ b/apps/desktop/src/main/cindy-make/__tests__/manager.test.ts
@@ -0,0 +1,185 @@
+import { describe, expect, it, vi } from 'vitest';
+import { CindyMakeManager } from '../manager.js';
+import type { MakeDoctorReport } from '../../../shared/cindyMakeDoctor.js';
+
+const report = (
+ runId: string,
+ status: MakeDoctorReport['status'] = 'running',
+): MakeDoctorReport => ({
+ runId,
+ platform: 'darwin',
+ arch: 'arm64',
+ status,
+ checks: [],
+});
+
+describe('CindyMakeManager', () => {
+ it('deduplicates one operation, replays progress, and keeps state after completion', async () => {
+ const manager = new CindyMakeManager();
+ const firstListener = vi.fn();
+ const secondListener = vi.fn();
+ const first = manager.claim(
+ { resource: 'environment', mode: 'check', forceManagedTools: false },
+ 'first',
+ 1,
+ firstListener,
+ );
+ first.publish(report('first'));
+ const second = manager.claim(
+ { resource: 'environment', mode: 'check', forceManagedTools: false },
+ 'second',
+ 2,
+ secondListener,
+ );
+
+ expect(second.attached).toBe(true);
+ expect(secondListener).toHaveBeenLastCalledWith({ ...report('first'), runId: 'second' });
+ first.complete(report('first', 'completed'));
+ await expect(second.promise).resolves.toMatchObject({ runId: 'second', status: 'completed' });
+ expect(manager.getState().environmentCheck).toMatchObject({
+ active: false,
+ report: { status: 'completed' },
+ });
+ expect(
+ manager.snapshot({ resource: 'environment', mode: 'check', forceManagedTools: false }),
+ ).toMatchObject({
+ status: 'completed',
+ });
+ });
+
+ it('continues after a listener unsubscribes and only explicit cancel aborts it', () => {
+ const manager = new CindyMakeManager();
+ const listener = vi.fn();
+ const operation = manager.claim(
+ { resource: 'source', mode: 'prepare', forceManagedTools: false },
+ 'source-run',
+ 1,
+ listener,
+ );
+ operation.unsubscribe();
+ operation.publish(report('source-run'));
+ expect(listener).not.toHaveBeenCalled();
+ expect(operation.controller.signal.aborted).toBe(false);
+ expect(manager.cancel('source-run', 99)).toBe('cancelled');
+ expect(operation.controller.signal.aborted).toBe(true);
+ });
+
+ it('does not attach operations with different preparation parameters', () => {
+ const manager = new CindyMakeManager();
+ const first = manager.claim(
+ { resource: 'environment', mode: 'prepare', forceManagedTools: false },
+ 'system',
+ 1,
+ vi.fn(),
+ );
+ const second = manager.claim(
+ { resource: 'environment', mode: 'prepare', forceManagedTools: true },
+ 'managed',
+ 1,
+ vi.fn(),
+ );
+ expect(first.attached).toBe(false);
+ expect(second.attached).toBe(false);
+ });
+
+ it('shares the prepared context without broadcasting it', async () => {
+ const manager = new CindyMakeManager();
+ const key = { resource: 'environment', mode: 'prepare', forceManagedTools: false } as const;
+ const first = manager.claim<{ selectedTool: string }>(key, 'first', 1, vi.fn());
+ const attached = manager.claim<{ selectedTool: string }>(key, 'attached', 2, vi.fn());
+ const context = { selectedTool: 'managed-node' };
+ first.complete(report('first', 'completed'), context);
+ await attached.promise;
+ expect(first.context).toBe(context);
+ expect(attached.context).toBe(context);
+ expect(manager.getState().environmentPrepare).toEqual({
+ active: false,
+ report: report('first', 'completed'),
+ });
+ });
+
+ it.each(['canonical', 'attached'])(
+ 'allows explicit preparation cancellation using the %s id after unsubscribe',
+ async (target) => {
+ const manager = new CindyMakeManager();
+ const key = { resource: 'environment', mode: 'prepare', forceManagedTools: false } as const;
+ const first = manager.claim(key, 'canonical', 1, vi.fn());
+ const attached = manager.claim(key, 'attached', 2, vi.fn());
+ const stateListener = vi.fn();
+ const unsubscribeState = manager.subscribe(stateListener);
+ first.unsubscribe();
+ attached.unsubscribe();
+ unsubscribeState();
+ first.publish(report('canonical'));
+ expect(first.controller.signal.aborted).toBe(false);
+ expect(stateListener).toHaveBeenCalledTimes(1);
+ expect(manager.cancel(target, target === 'canonical' ? 99 : 2)).toBe('cancelled');
+ expect(attached.controller.signal.aborted).toBe(true);
+ first.complete(report('canonical', 'cancelled'));
+ await expect(attached.promise).resolves.toMatchObject({
+ runId: 'attached',
+ status: 'cancelled',
+ });
+ expect(manager.cancel(target, 99)).toBe('not-found');
+ },
+ );
+
+ it('allows attached diagnostic participants to stop without admitting other windows', () => {
+ const manager = new CindyMakeManager();
+ const key = { resource: 'environment', mode: 'check', forceManagedTools: false } as const;
+ const first = manager.claim(key, 'first', 1, vi.fn());
+ manager.claim(key, 'attached', 2, vi.fn());
+ expect(manager.cancel('first', 99)).toBe('forbidden');
+ expect(manager.cancel('attached', 2)).toBe('cancelled');
+ expect(first.controller.signal.aborted).toBe(true);
+ first.complete(report('first', 'cancelled'));
+ });
+
+ it('keeps workflow cancellation private and separate from the completed environment', () => {
+ const manager = new CindyMakeManager();
+ const key = { resource: 'environment', mode: 'prepare', forceManagedTools: false } as const;
+ const environment = manager.claim(key, 'first', 1, vi.fn());
+ manager.claim(key, 'second', 2, vi.fn());
+ environment.complete(report('first', 'completed'));
+ const first = manager.startWorkflow('first', 1);
+ const second = manager.startWorkflow('second', 2);
+ expect(manager.cancel('first', 2)).toBe('forbidden');
+ expect(manager.cancel('first', 1)).toBe('cancelled');
+ expect(first.controller.signal.aborted).toBe(true);
+ expect(second.controller.signal.aborted).toBe(false);
+ expect(environment.controller.signal.aborted).toBe(false);
+ expect(manager.getState().environmentPrepare).toEqual({
+ active: false,
+ report: report('first', 'completed'),
+ });
+ expect(() => manager.claim(key, 'second', 2, vi.fn())).toThrow('already running');
+ expect(() => manager.startWorkflow('second', 2)).toThrow('already running');
+ first.complete();
+ const retried = manager.startWorkflow('first', 1);
+ first.complete();
+ expect(manager.cancel('first', 1)).toBe('cancelled');
+ expect(retried.controller.signal.aborted).toBe(true);
+ retried.complete();
+ second.complete();
+ expect(manager.cancel('second', 2)).toBe('not-found');
+ });
+
+ it('rejects duplicate run ids across different resources', () => {
+ const manager = new CindyMakeManager();
+ const first = manager.claim(
+ { resource: 'environment', mode: 'prepare', forceManagedTools: false },
+ 'same-id',
+ 1,
+ vi.fn(),
+ );
+ expect(() =>
+ manager.claim(
+ { resource: 'source', mode: 'prepare', forceManagedTools: false },
+ 'same-id',
+ 2,
+ vi.fn(),
+ ),
+ ).toThrow('already running');
+ first.complete(report('same-id', 'completed'));
+ });
+});
diff --git a/apps/desktop/src/main/cindy-make/__tests__/runtimeSourceBuild.test.ts b/apps/desktop/src/main/cindy-make/__tests__/runtimeSourceBuild.test.ts
new file mode 100644
index 0000000000..95b2a00a1e
--- /dev/null
+++ b/apps/desktop/src/main/cindy-make/__tests__/runtimeSourceBuild.test.ts
@@ -0,0 +1,73 @@
+import path from 'node:path';
+import { describe, expect, it, vi } from 'vitest';
+import { captureRuntimeSource, cindyRuntimeSourcePlugin } from '../../../../cindy-runtime-source';
+
+const root = path.resolve('source-checkout');
+const commit = 'a'.repeat(40);
+const deps = (status = '') => ({
+ git: vi.fn((args: string[]) =>
+ args[0] === 'status'
+ ? status
+ : args[0] === 'show'
+ ? '{"version":"0.0.0","name":"desktop"}'
+ : commit,
+ ),
+ readPackage: vi.fn(() => '{"version":"1.2.3","name":"desktop"}'),
+});
+
+describe('runtime source build capture', () => {
+ it('embeds a fixed commit and dirty marker, never a mutable branch name', () => {
+ expect(captureRuntimeSource(root, true, deps())).toEqual({ commit, dirty: false, root });
+ expect(captureRuntimeSource(root, false, deps())).toEqual({ commit, dirty: false });
+ });
+ it.each([' M changed.ts\0', '?? local.ts\0', 'M staged.ts\0'])(
+ 'marks %s as uncertain',
+ (status) => {
+ expect(captureRuntimeSource(root, false, deps(status)).dirty).toBe(true);
+ },
+ );
+ it('ignores only the packaging version substitution, not local code edits', () => {
+ const versionOnly = deps(' M apps/desktop/package.json\0');
+ expect(captureRuntimeSource(root, false, versionOnly).dirty).toBe(false);
+ expect(captureRuntimeSource(root, true, versionOnly).dirty).toBe(true);
+ versionOnly.readPackage.mockReturnValue('{"version":"1.2.3","name":"different"}');
+ expect(captureRuntimeSource(root, false, versionOnly).dirty).toBe(true);
+ expect(
+ captureRuntimeSource(root, false, deps(' M apps/desktop/package.json\0 M file.ts\0')).dirty,
+ ).toBe(true);
+ });
+ it('does not fabricate an identity when Git is absent or moves during capture', () => {
+ const moving = deps();
+ moving.git
+ .mockReturnValueOnce(commit)
+ .mockReturnValueOnce('')
+ .mockReturnValueOnce('b'.repeat(40));
+ expect(captureRuntimeSource(root, true, moving)).toEqual({});
+ const failing = deps();
+ failing.git.mockImplementation(() => {
+ throw new Error('git unavailable');
+ });
+ expect(captureRuntimeSource(root, false, failing)).toEqual({});
+ });
+ it('re-captures a cached module on rebuild and touches only the runtime identity module', () => {
+ const capture = vi.fn(() => ({ commit, dirty: false }));
+ const plugin = cindyRuntimeSourcePlugin(root, true, capture);
+ const transform = plugin.transform as (
+ source: string,
+ id: string,
+ ) => { code: string } | undefined;
+ const cached = plugin.shouldTransformCachedModule as (input: {
+ id: string;
+ }) => boolean | undefined;
+ const moduleId = path.join(root, 'apps/desktop/src/main/cindy-make/runtimeVersion.ts');
+ const source = 'const build = import.meta.env.CINDY_RUNTIME_SOURCE ?? {};';
+ expect(cached({ id: moduleId })).toBe(true);
+ expect(cached({ id: moduleId.replaceAll(path.sep, '\\') })).toBe(true);
+ expect(transform(source, moduleId)?.code).toContain(commit);
+ capture.mockReturnValue({ commit: 'b'.repeat(40), dirty: true });
+ expect(transform(source, moduleId)?.code).toContain('b'.repeat(40));
+ expect(transform(source, 'unrelated.ts')).toBeUndefined();
+ expect(cached({ id: 'unrelated.ts' })).toBeUndefined();
+ expect(capture).toHaveBeenCalledTimes(2);
+ });
+});
diff --git a/apps/desktop/src/main/cindy-make/__tests__/runtimeVersion.git-integration.test.ts b/apps/desktop/src/main/cindy-make/__tests__/runtimeVersion.git-integration.test.ts
new file mode 100644
index 0000000000..594bf291ec
--- /dev/null
+++ b/apps/desktop/src/main/cindy-make/__tests__/runtimeVersion.git-integration.test.ts
@@ -0,0 +1,78 @@
+import { execFile } from 'node:child_process';
+import { mkdtemp, rm, writeFile } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { expect, it } from 'vitest';
+import { resolveMakeRuntime, type RuntimeGit } from '../runtimeVersion';
+
+it('uses real ancestry for a running Dev build, including unmerged heads, branches and reverts', async () => {
+ const root = await mkdtemp(path.join(os.tmpdir(), 'cindy-runtime-source-'));
+ const signal = new AbortController().signal;
+ const environment = {
+ PATH: process.env.PATH,
+ SystemRoot: process.env.SystemRoot,
+ HOME: root,
+ USERPROFILE: root,
+ XDG_CONFIG_HOME: root,
+ GIT_CONFIG_GLOBAL: os.devNull,
+ GIT_CONFIG_NOSYSTEM: '1',
+ GIT_AUTHOR_NAME: 'Runtime Test',
+ GIT_AUTHOR_EMAIL: '[email protected]',
+ GIT_COMMITTER_NAME: 'Runtime Test',
+ GIT_COMMITTER_EMAIL: '[email protected]',
+ };
+ const git: RuntimeGit = (cwd, args, abortSignal) =>
+ new Promise((resolve) => {
+ execFile(
+ 'git',
+ args,
+ { cwd, env: environment, signal: abortSignal, encoding: 'utf8', windowsHide: true },
+ (error, stdout) => {
+ resolve({ code: error ? (typeof error.code === 'number' ? error.code : -1) : 0, stdout });
+ },
+ );
+ });
+ const run = async (args: string[]) => {
+ const result = await git(root, args, signal);
+ expect(result.code).toBe(0);
+ return result.stdout.trim();
+ };
+ const snapshot = (commit: string) =>
+ resolveMakeRuntime(
+ { packaged: false, version: '0.0.0' },
+ signal,
+ { commit, dirty: false, root },
+ git,
+ );
+ try {
+ await run(['init', '--initial-branch=main']);
+ await run(['commit', '--allow-empty', '--no-gpg-sign', '-m', 'base']);
+ const base = await run(['rev-parse', 'HEAD']);
+ await run(['checkout', '-b', 'feature']);
+ await writeFile(path.join(root, 'feature.txt'), 'feature\n');
+ await run(['add', 'feature.txt']);
+ await run(['commit', '--no-gpg-sign', '-m', 'feature']);
+ const feature = await run(['rev-parse', 'HEAD']);
+ const personal = await snapshot(feature);
+ expect(await personal.containsCommit(feature)).toBe('included');
+ expect(await personal.containsCommit(base)).toBe('included');
+ await run(['checkout', 'main']);
+ expect(await personal.isCurrent()).toBe(false);
+ expect(await personal.containsCommit(feature)).toBe('unknown');
+ const previous = await snapshot(base);
+ expect(await previous.containsCommit(feature)).toBe('notIncluded');
+ await run(['commit', '--allow-empty', '--no-gpg-sign', '-m', 'main changes']);
+ const divergent = await snapshot(await run(['rev-parse', 'HEAD']));
+ expect(await divergent.containsCommit(feature)).toBe('unknown');
+ await run(['merge', '--no-edit', '--no-gpg-sign', 'feature']);
+ const merged = await snapshot(await run(['rev-parse', 'HEAD']));
+ expect(await merged.containsCommit(feature)).toBe('included');
+ await run(['revert', '--no-edit', '--no-gpg-sign', feature]);
+ const reverted = await snapshot(await run(['rev-parse', 'HEAD']));
+ expect(await reverted.containsCommit(feature)).toBe('unknown');
+ await writeFile(path.join(root, 'uncommitted.txt'), 'local override');
+ expect(await reverted.isCurrent()).toBe(false);
+ } finally {
+ await rm(root, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+ }
+}, 30_000);
diff --git a/apps/desktop/src/main/cindy-make/__tests__/runtimeVersion.test.ts b/apps/desktop/src/main/cindy-make/__tests__/runtimeVersion.test.ts
new file mode 100644
index 0000000000..4c4e3fb162
--- /dev/null
+++ b/apps/desktop/src/main/cindy-make/__tests__/runtimeVersion.test.ts
@@ -0,0 +1,129 @@
+import path from 'node:path';
+import { describe, expect, it, vi } from 'vitest';
+import { resolveMakeRuntime, type RuntimeGit } from '../runtimeVersion';
+
+const commit = 'a'.repeat(40);
+const candidate = 'b'.repeat(40);
+const root = path.resolve('runtime-checkout');
+const build = { commit, dirty: false, root };
+const signal = () => new AbortController().signal;
+const cleanGit = () =>
+ vi.fn<RuntimeGit>(async (_root, args) => ({
+ code: 0,
+ stdout: args[0] === 'rev-parse' ? commit : '',
+ }));
+
+describe('Cindy Make running source identity', () => {
+ it.each([
+ [false, '0.0.0', 'dev'],
+ [true, '1.2.3-beta.1', 'beta'],
+ [true, '1.2.3', 'release'],
+ [true, '0.0.0', 'release'],
+ ] as const)(
+ 'identifies packaged=%s version=%s without using prepared source',
+ async (packaged, version, channel) => {
+ const git = cleanGit();
+ const result = await resolveMakeRuntime({ packaged, version }, signal(), build, git);
+ expect(result.runtime).toEqual({ channel, version, commit, confidence: 'exact' });
+ expect(await result.containsCommit(commit)).toBe('included');
+ if (packaged) expect(git).not.toHaveBeenCalled();
+ else expect(git.mock.calls.every(([cwd]) => cwd === root)).toBe(true);
+ },
+ );
+
+ it.each([{}, { commit }, { commit, dirty: true }, { commit: 'main', dirty: false }])(
+ 'never guesses a commit from a version/tag when source metadata is uncertain: %j',
+ async (source) => {
+ const git = cleanGit();
+ const result = await resolveMakeRuntime(
+ { packaged: true, version: '1.2.3' },
+ signal(),
+ source,
+ git,
+ );
+ expect(result.runtime.confidence).toBe('unknown');
+ expect(await result.containsCommit(commit)).toBe('unknown');
+ expect(git).not.toHaveBeenCalled();
+ },
+ );
+
+ it.each(['moved', 'dirty', 'failed', 'missing-root'])(
+ 'keeps Dev identity uncertain for %s',
+ async (reason) => {
+ const git = cleanGit();
+ if (reason === 'moved') git.mockImplementation(async () => ({ code: 0, stdout: candidate }));
+ if (reason === 'dirty')
+ git.mockImplementation(async (_root, args) => ({
+ code: 0,
+ stdout: args[0] === 'rev-parse' ? commit : ' M file.ts\0',
+ }));
+ if (reason === 'failed') git.mockRejectedValue(new Error('git unavailable'));
+ const result = await resolveMakeRuntime(
+ { packaged: false, version: '0.0.0' },
+ signal(),
+ { ...build, root: reason === 'missing-root' ? undefined : root },
+ git,
+ );
+ expect(result.runtime.confidence).toBe('unknown');
+ expect(await result.containsCommit(candidate)).toBe('unknown');
+ expect(result.runtime.commit).toBe(commit);
+ },
+ );
+
+ it('invalidates Dev results if files change after the initial snapshot', async () => {
+ const git = cleanGit();
+ const result = await resolveMakeRuntime(
+ { packaged: false, version: '0.0.0' },
+ signal(),
+ build,
+ git,
+ );
+ git.mockResolvedValue({ code: 0, stdout: ' M changed.ts\0' });
+ expect(await result.isCurrent()).toBe(false);
+ expect(await result.containsCommit(commit)).toBe('unknown');
+ git.mockImplementation(async (_root, args) => ({
+ code: 0,
+ stdout: args[0] === 'rev-parse' ? commit : '',
+ }));
+ expect(await result.isCurrent()).toBe(false);
+ });
+
+ it.each([
+ ['ancestor', 0, '', 'included'],
+ ['reverted', 0, 'Revert original\nThis reverts commit ' + candidate, 'unknown'],
+ ['later', 1, '', 'notIncluded'],
+ ['diverged', 1, '', 'unknown'],
+ ['unavailable', 128, '', 'unknown'],
+ ] as const)('checks immutable commits for %s', async (kind, ancestorCode, log, expected) => {
+ const git = cleanGit();
+ git.mockImplementation(async (_root, args) => {
+ if (args[0] === 'rev-parse') return { code: 0, stdout: commit };
+ if (args[0] === 'merge-base')
+ return {
+ code: args[2] === candidate ? ancestorCode : kind === 'later' ? 0 : 1,
+ stdout: '',
+ };
+ return { code: 0, stdout: args[0] === 'log' ? log : '' };
+ });
+ const result = await resolveMakeRuntime(
+ { packaged: false, version: '0.0.0' },
+ signal(),
+ build,
+ git,
+ );
+ expect(await result.containsCommit(candidate)).toBe(expected);
+ expect(git.mock.calls.some(([, args]) => args.includes('origin/main'))).toBe(false);
+ });
+
+ it('does not treat an aborted query as a verified runtime', async () => {
+ const controller = new AbortController();
+ controller.abort();
+ const result = await resolveMakeRuntime(
+ { packaged: true, version: '1.0.0' },
+ controller.signal,
+ build,
+ cleanGit(),
+ );
+ expect(result.runtime.confidence).toBe('unknown');
+ });
+});
diff --git a/apps/desktop/src/main/cindy-make/__tests__/sourceGit.test.ts b/apps/desktop/src/main/cindy-make/__tests__/sourceGit.test.ts
index 1817585850..e5dbebaeca 100644
--- a/apps/desktop/src/main/cindy-make/__tests__/sourceGit.test.ts
+++ b/apps/desktop/src/main/cindy-make/__tests__/sourceGit.test.ts
@@ -1,5 +1,30 @@
-import { describe, expect, it } from 'vitest';
-import { parseSourceGitProgress } from '../sourceGit.js';
+import { spawn } from 'node:child_process';
+import { EventEmitter } from 'node:events';
+import path from 'node:path';
+import { PassThrough } from 'node:stream';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { parseSourceGitProgress, runSourceGit } from '../sourceGit.js';
+import type { MakeSourceGitProgress } from '../../../shared/cindyMakeDoctor.js';
+
+vi.mock('node:child_process', () => ({ spawn: vi.fn() }));
+
+const workingDirectory = path.resolve('source-checkout');
+const environment = { PATH: path.resolve('managed-tools') };
+
+function mockGitProcess() {
+ const child = Object.assign(new EventEmitter(), {
+ stdout: new PassThrough(),
+ stderr: new PassThrough(),
+ kill: vi.fn(),
+ });
+ vi.mocked(spawn).mockReturnValue(child as unknown as ReturnType<typeof spawn>);
+ return child;
+}
+
+afterEach(() => {
+ vi.restoreAllMocks();
+ vi.mocked(spawn).mockReset();
+});
describe('Cindy Make Git progress', () => {
it('parses Git progress without exposing the raw line', () => {
@@ -17,4 +42,144 @@ describe('Cindy Make Git progress', () => {
expect(parseSourceGitProgress('remote: Total 9 (delta 1)')).toBeUndefined();
expect(parseSourceGitProgress('Receiving objects: 101%')).toBeUndefined();
});
+
+ it('does not kill Git when stdout exceeds the capture limit', async () => {
+ const child = mockGitProcess();
+ const signal = new AbortController().signal;
+ const result = runSourceGit(environment, ['status'], workingDirectory, signal);
+ expect(spawn).toHaveBeenCalledExactlyOnceWith('git', ['status'], {
+ cwd: workingDirectory,
+ env: { ...environment, LC_ALL: 'C', LANG: 'C', GIT_TERMINAL_PROMPT: '0' },
+ windowsHide: true,
+ stdio: ['ignore', 'pipe', 'pipe'],
+ signal,
+ });
+ child.stdout.write('x'.repeat(35_000));
+ child.stdout.write('x'.repeat(35_000));
+ child.emit('close', 0, null);
+
+ await expect(result).resolves.toBe('x'.repeat(64 * 1024));
+ expect(child.kill).not.toHaveBeenCalled();
+ });
+
+ it('retains stderr details when Git fails', async () => {
+ const child = mockGitProcess();
+ const result = runSourceGit(
+ environment,
+ ['status'],
+ workingDirectory,
+ new AbortController().signal,
+ );
+ child.stderr.write('fatal: test failure\n');
+ child.emit('close', 1, null);
+
+ await expect(result).rejects.toMatchObject({
+ code: 'gitFailed',
+ operation: 'status',
+ exitCode: 1,
+ exitSignal: null,
+ stderr: 'fatal: test failure',
+ });
+ });
+
+ it('retains a sanitized latest Git progress line for activity feedback', async () => {
+ const child = mockGitProcess();
+ const progress: MakeSourceGitProgress[] = [];
+ const result = runSourceGit(
+ environment,
+ ['status'],
+ workingDirectory,
+ new AbortController().signal,
+ (value) => progress.push(value),
+ );
+ child.stderr.write(Buffer.from('remote: Receiv'));
+ child.stderr.write(
+ Buffer.from('ing objects: 42% (123/456) https://secret.example/x\x1b[0m\r'),
+ );
+ child.stderr.write('Receiving objects: 100% (456/456)\n');
+ child.emit('close', 0, null);
+
+ await expect(result).resolves.toBe('');
+ expect(progress).toEqual([
+ {
+ stage: 'receiving',
+ percent: 42,
+ message: 'remote: Receiving objects: 42% (123/456) [REDACTED_URL]',
+ },
+ { stage: 'receiving', percent: 100, message: 'Receiving objects: 100% (456/456)' },
+ ]);
+ });
+
+ it('bounds stderr to its latest diagnostics and redacts URLs and credentials', async () => {
+ const child = mockGitProcess();
+ const result = runSourceGit(
+ environment,
+ ['fetch'],
+ workingDirectory,
+ new AbortController().signal,
+ ).catch((error) => error);
+ child.stderr.write('old diagnostic\n' + 'x'.repeat(20_000));
+ child.stderr.write('\nfatal: token=abcdefghijklmnop https://secret.example/repository\n');
+ child.emit('close', 128, null);
+
+ const failure = await result;
+ expect(failure).toBeInstanceOf(Error);
+ expect(failure).toMatchObject({ code: 'gitFailed', operation: 'fetch', exitCode: 128 });
+ expect(failure.stderr).toMatch(/^\[stderr truncated\] /);
+ expect(failure.stderr.length).toBeLessThanOrEqual(16 * 1024 + '[stderr truncated] '.length);
+ expect(failure.stderr).toContain('fatal: token=[REDACTED] [REDACTED_URL]');
+ expect(failure.stderr).not.toMatch(/old diagnostic|abcdefghijklmnop|secret\.example/);
+ });
+
+ it('waits for process close after cancellation before rejecting', async () => {
+ const child = mockGitProcess();
+ const controller = new AbortController();
+ const result = runSourceGit(environment, ['fetch'], workingDirectory, controller.signal);
+ const settled = vi.fn();
+ void result.then(settled, settled);
+ controller.abort();
+ child.emit('error', Object.assign(new Error('aborted'), { code: 'ABORT_ERR' }));
+ await new Promise<void>((resolve) => setImmediate(resolve));
+ expect(settled).not.toHaveBeenCalled();
+ child.stderr.write('fatal: cancelled\n');
+ child.emit('close', null, 'SIGTERM');
+
+ await expect(result).rejects.toMatchObject({
+ code: 'cancelled',
+ operation: 'fetch',
+ spawnCode: 'ABORT_ERR',
+ exitCode: null,
+ exitSignal: 'SIGTERM',
+ stderr: 'fatal: cancelled',
+ });
+ });
+
+ it('does not spawn Git for an already cancelled operation', async () => {
+ const controller = new AbortController();
+ controller.abort();
+
+ await expect(
+ runSourceGit(environment, ['fetch'], workingDirectory, controller.signal),
+ ).rejects.toBe(controller.signal.reason);
+ expect(spawn).not.toHaveBeenCalled();
+ });
+
+ it('reports spawn failures after process close', async () => {
+ const child = mockGitProcess();
+ const result = runSourceGit(
+ environment,
+ ['status'],
+ workingDirectory,
+ new AbortController().signal,
+ );
+ child.emit('error', Object.assign(new Error('Git unavailable'), { code: 'ENOENT' }));
+ child.emit('close', null, null);
+
+ await expect(result).rejects.toMatchObject({
+ code: 'gitFailed',
+ operation: 'status',
+ spawnCode: 'ENOENT',
+ exitCode: null,
+ });
+ });
});
diff --git a/apps/desktop/src/main/cindy-make/__tests__/sourcePreparation.test.ts b/apps/desktop/src/main/cindy-make/__tests__/sourcePreparation.test.ts
index 55731bbbc0..749da2a71e 100644
--- a/apps/desktop/src/main/cindy-make/__tests__/sourcePreparation.test.ts
+++ b/apps/desktop/src/main/cindy-make/__tests__/sourcePreparation.test.ts
@@ -1,5 +1,5 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { access, mkdir, mkdtemp, rm } from 'node:fs/promises';
+import { access, mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises';
import os from 'node:os';
import path from 'node:path';
import {
@@ -22,7 +22,27 @@ import type { DoctorProbeResult } from '../doctor.js';
vi.mock('../sourceGit.js', () => ({ runSourceGit: vi.fn() }));
vi.mock('../sourcePnpm.js', () => ({ runSourcePnpm: vi.fn(async () => undefined) }));
-describe('Git-only source preparation', () => {
+async function createExistingCheckout(sourcePath: string): Promise<void> {
+ await mkdir(path.join(sourcePath, '.git'), { recursive: true });
+ await writeFile(path.join(sourcePath, '.git', 'index'), 'test');
+ await writeFile(path.join(sourcePath, 'package.json'), '{}');
+}
+
+async function probeReadyTool(command: string): Promise<DoctorProbeResult> {
+ const stdout =
+ command === 'git'
+ ? 'git version 2.45.0'
+ : command === 'node'
+ ? 'v24.16.0'
+ : command === 'pnpm'
+ ? '10.33.2'
+ : command === 'python3'
+ ? 'Python 3.12.10'
+ : '';
+ return { status: stdout ? 'ok' : 'missing', stdout, path: command };
+}
+
+describe('Source and dependency preparation', () => {
let root: string;
beforeEach(async () => {
root = await mkdtemp(path.join(os.tmpdir(), 'cindy-make-source-'));
@@ -39,10 +59,10 @@ describe('Git-only source preparation', () => {
['darwin', 'system', true],
['darwin', 'managed', false],
] as const)(
- 'uses only %s %s Git for an existing checkout: %s',
+ 'uses %s %s tools to prepare source and dependencies (existing checkout: %s)',
async (platform, source, existing) => {
const sourcePath = path.join(root, 'source');
- if (existing) await mkdir(path.join(sourcePath, '.git'), { recursive: true });
+ if (existing) await createExistingCheckout(sourcePath);
const systemGit = path.join(root, 'system', 'git');
const managedGit = path.join(root, 'tools', 'git');
const probe = vi.fn(
@@ -51,10 +71,12 @@ describe('Git-only source preparation', () => {
command: string,
args: readonly string[],
): Promise<DoctorProbeResult> => {
- if (command !== 'git' || args.join(' ') !== '--version')
- return { status: 'missing', stdout: '' };
+ if (args.join(' ') !== '--version') return { status: 'missing', stdout: '' };
if (source === 'managed' && !executable) return { status: 'missing', stdout: '' };
- return { status: 'ok', stdout: 'git version 2.45.0', path: executable ?? systemGit };
+ return {
+ ...(await probeReadyTool(command)),
+ path: executable ?? path.join(root, 'system', command),
+ };
},
);
const native = vi.fn();
@@ -63,12 +85,33 @@ describe('Git-only source preparation', () => {
(paths) => ({
platform,
arch: 'x64',
- probe: (command, args) => probe(paths.git, command, args),
+ probe: (command, args) =>
+ probe(
+ command === 'node'
+ ? paths.node
+ : command === 'pnpm'
+ ? paths.pnpm
+ : command === 'python3'
+ ? paths.python
+ : paths.git,
+ command,
+ args,
+ ),
native,
storage,
}),
- { git: managedGit },
- (paths) => ({ CINDY_TEST_GIT: paths.git }),
+ {
+ git: managedGit,
+ node: path.join(root, 'tools', 'node'),
+ pnpm: path.join(root, 'tools', 'pnpm'),
+ python: path.join(root, 'tools', 'python3'),
+ },
+ (paths) => ({
+ CINDY_TEST_GIT: paths.git,
+ CINDY_TEST_NODE: paths.node,
+ CINDY_TEST_PNPM: paths.pnpm,
+ CINDY_TEST_PYTHON: paths.python,
+ }),
);
const selectedGit = source === 'system' ? systemGit : managedGit;
vi.mocked(runSourceGit).mockImplementation(async (processEnv, args) => {
@@ -79,7 +122,11 @@ describe('Git-only source preparation', () => {
case 'remote':
return CINDY_SOURCE_REPOSITORY;
case 'rev-parse':
+ return args[1] === '--abbrev-ref' ? 'cindy-personal' : '0123456789abcdef';
+ case 'merge-base':
return '0123456789abcdef';
+ case 'rev-list':
+ return '0\t0';
// No personal branch yet: preparation must create it from the baseline.
case 'branch':
return '';
@@ -97,7 +144,12 @@ describe('Git-only source preparation', () => {
status: 'ready',
commit: '0123456789abcdef',
branch: 'cindy-personal',
+ currentBranch: 'cindy-personal',
baseCommit: '0123456789abcdef',
+ mainCommit: '0123456789abcdef',
+ mainRemoteCommit: '0123456789abcdef',
+ mainBehind: 0,
+ mainAhead: 0,
});
const gitCalls = vi.mocked(runSourceGit).mock.calls;
const createBranch = gitCalls.find(
@@ -109,17 +161,30 @@ describe('Git-only source preparation', () => {
expect(checkout?.[1]).toEqual(['checkout', 'cindy-personal']);
expect(checkout?.[2]).toBe(sourcePath);
expect(gitCalls.some(([, args]) => args[0] === 'reset')).toBe(false);
- // Dependencies are installed per task worktree, never in the baseline checkout.
- expect(runSourcePnpm).not.toHaveBeenCalled();
+ expect(runSourcePnpm).toHaveBeenCalledExactlyOnceWith(
+ {
+ CINDY_TEST_GIT: selectedGit,
+ CINDY_TEST_NODE: path.join(root, source === 'system' ? 'system' : 'tools', 'node'),
+ CINDY_TEST_PNPM: path.join(root, source === 'system' ? 'system' : 'tools', 'pnpm'),
+ CINDY_TEST_PYTHON: path.join(root, source === 'system' ? 'system' : 'tools', 'python3'),
+ },
+ ['install', '--frozen-lockfile', '--prefer-offline', '--prod=false'],
+ sourcePath,
+ expect.any(AbortSignal),
+ );
+ const checkoutIndex = gitCalls.findIndex(([, args]) => args[0] === 'checkout');
+ expect(vi.mocked(runSourceGit).mock.invocationCallOrder[checkoutIndex]).toBeLessThan(
+ vi.mocked(runSourcePnpm).mock.invocationCallOrder[0],
+ );
await expect(readCindySourceStatus(root)).resolves.toMatchObject({
status: 'ready',
- branch: 'cindy-personal',
- baseCommit: '0123456789abcdef',
});
- expect(probe).toHaveBeenCalledTimes(source === 'system' ? 1 : 2);
+ await expect(readCindySourceStatus(root)).resolves.not.toHaveProperty('mainCommit');
+ expect(probe).toHaveBeenCalledTimes(source === 'system' ? 4 : 8);
expect(
probe.mock.calls.every(
- ([, command, args]) => command === 'git' && args.join(' ') === '--version',
+ ([, command, args]) =>
+ ['git', 'node', 'pnpm', 'python3'].includes(command) && args.join(' ') === '--version',
),
).toBe(true);
expect(native).not.toHaveBeenCalled();
@@ -131,6 +196,190 @@ describe('Git-only source preparation', () => {
},
);
+ describe('personal branch dependencies', () => {
+ let env: MakeToolchainEnvironment;
+ beforeEach(async () => {
+ await createExistingCheckout(path.join(root, 'source'));
+ env = {
+ platform: 'darwin',
+ probe: vi.fn(probeReadyTool),
+ processEnvironment: () => ({}),
+ } as unknown as MakeToolchainEnvironment;
+ vi.mocked(runSourceGit).mockImplementation(async (_env, args) => {
+ if (args[0] === 'ls-remote') return '0123456789abcdef refs/heads/main';
+ if (args[0] === 'remote') return CINDY_SOURCE_REPOSITORY;
+ if (args[0] === 'branch') return 'cindy-personal';
+ if (args[0] === 'rev-parse') return '0123456789abcdef';
+ return '';
+ });
+ });
+
+ it('keeps the shared job preparing until installation completes, including late subscribers', async () => {
+ let finishInstall!: () => void;
+ vi.mocked(runSourcePnpm).mockImplementationOnce(
+ () =>
+ new Promise<void>((resolve) => {
+ finishInstall = resolve;
+ }),
+ );
+ const progress = vi.fn();
+ const first = prepareCindySource(
+ env,
+ root,
+ { channel: 'dev', version: '0.0.0' },
+ new AbortController().signal,
+ progress,
+ );
+ await vi.waitFor(() => expect(runSourcePnpm).toHaveBeenCalledOnce());
+ await expect(readCurrentCindySourceStatus(root)).resolves.toMatchObject({
+ status: 'preparing',
+ phase: 'installing',
+ branch: 'cindy-personal',
+ });
+ await expect(readCindySourceStatus(root)).resolves.toMatchObject({
+ status: 'preparing',
+ phase: 'installing',
+ });
+ expect(progress.mock.calls.some(([update]) => update.status === 'ready')).toBe(false);
+ const lateProgress = vi.fn();
+ const second = prepareCindySource(
+ env,
+ root,
+ { channel: 'dev', version: '0.0.0' },
+ new AbortController().signal,
+ lateProgress,
+ );
+ expect(lateProgress).toHaveBeenCalledWith(expect.objectContaining({ phase: 'installing' }));
+ finishInstall();
+ const [firstResult, secondResult] = await Promise.all([first, second]);
+ expect(firstResult).toBe(secondResult);
+ expect(firstResult.status).toBe('ready');
+ expect(runSourcePnpm).toHaveBeenCalledOnce();
+ await expect(readCindySourceStatus(root)).resolves.toMatchObject({ status: 'ready' });
+ });
+
+ it('reports install failure and retries the existing personal checkout without resetting it', async () => {
+ vi.mocked(runSourcePnpm).mockRejectedValueOnce(
+ Object.assign(new Error('installation failed'), { code: 'installFailed' }),
+ );
+ const progress = vi.fn();
+ await expect(
+ prepareCindySource(
+ env,
+ root,
+ { channel: 'dev', version: '0.0.0' },
+ new AbortController().signal,
+ progress,
+ ),
+ ).resolves.toMatchObject({ status: 'failed', error: 'installFailed' });
+ expect(progress.mock.calls.some(([update]) => update.status === 'ready')).toBe(false);
+ await expect(readCindySourceStatus(root)).resolves.toMatchObject({
+ status: 'failed',
+ error: 'installFailed',
+ });
+ await expect(
+ prepareCindySource(
+ env,
+ root,
+ { channel: 'dev', version: '0.0.0' },
+ new AbortController().signal,
+ ),
+ ).resolves.toMatchObject({ status: 'ready' });
+ expect(runSourcePnpm).toHaveBeenCalledTimes(2);
+ expect(
+ vi
+ .mocked(runSourceGit)
+ .mock.calls.some(
+ ([, args]) =>
+ ['clone', 'reset'].includes(args[0]) ||
+ (args[0] === 'branch' && args[1] !== '--list'),
+ ),
+ ).toBe(false);
+ });
+
+ it('does not mark a cancelled installation ready even if the child completes successfully', async () => {
+ const controller = new AbortController();
+ vi.mocked(runSourcePnpm).mockImplementationOnce(async (_env, _args, _cwd, signal) => {
+ expect(cancelCindySourcePreparation()).toBe(true);
+ expect(signal.aborted).toBe(true);
+ });
+ const progress = vi.fn();
+ await expect(
+ prepareCindySource(
+ env,
+ root,
+ { channel: 'dev', version: '0.0.0' },
+ controller.signal,
+ progress,
+ ),
+ ).resolves.toMatchObject({ status: 'cancelled', error: 'cancelled' });
+ expect(progress.mock.calls.some(([update]) => update.status === 'ready')).toBe(false);
+ await expect(readCindySourceStatus(root)).resolves.toMatchObject({ status: 'cancelled' });
+ expect(cancelCindySourcePreparation()).toBe(false);
+ });
+
+ it.each(['node', 'pnpm', 'python3'] as const)(
+ 'fails without installing when %s is unavailable',
+ async (tool) => {
+ vi.mocked(env.probe).mockImplementation(async (command) =>
+ command === tool ? { status: 'missing', stdout: '' } : probeReadyTool(command),
+ );
+ await expect(
+ prepareCindySource(
+ env,
+ root,
+ { channel: 'dev', version: '0.0.0' },
+ new AbortController().signal,
+ ),
+ ).resolves.toMatchObject({ status: 'failed', error: 'environmentNotReady' });
+ expect(runSourcePnpm).not.toHaveBeenCalled();
+ },
+ );
+
+ it('prepares dependencies for a previously Git-only ready checkout', async () => {
+ await writeFile(
+ path.join(root, 'source-status.json'),
+ JSON.stringify({
+ status: 'ready',
+ path: path.join(root, 'source'),
+ ref: 'main',
+ }),
+ );
+ await expect(
+ prepareCindySource(
+ env,
+ root,
+ { channel: 'dev', version: '0.0.0' },
+ new AbortController().signal,
+ ),
+ ).resolves.toMatchObject({ status: 'ready' });
+ expect(runSourcePnpm).toHaveBeenCalledOnce();
+ expect(vi.mocked(runSourceGit).mock.calls.some(([, args]) => args[0] === 'clone')).toBe(
+ false,
+ );
+ });
+
+ it('clears locally using Git alone and never starts an install', async () => {
+ await expect(
+ prepareCindySource(
+ env,
+ root,
+ { channel: 'dev', version: '0.0.0' },
+ new AbortController().signal,
+ undefined,
+ { clearOnly: true },
+ ),
+ ).resolves.toMatchObject({ status: 'ready', cleared: true });
+ expect(env.probe).toHaveBeenCalledExactlyOnceWith(
+ 'git',
+ ['--version'],
+ expect.any(AbortSignal),
+ );
+ expect(runSourcePnpm).not.toHaveBeenCalled();
+ await expect(readCindySourceStatus(root)).resolves.toMatchObject({ status: 'missing' });
+ });
+ });
+
it('publishes and cancels global source preparation state', async () => {
const statuses: string[] = [];
const unsubscribe = subscribeCindySourceStatus((status) => statuses.push(status.status));
@@ -162,6 +411,68 @@ describe('Git-only source preparation', () => {
unsubscribe();
});
+ it('hydrates Git details from an existing checkout when an old status file lacks them', async () => {
+ const sourcePath = path.join(root, 'source');
+ await createExistingCheckout(sourcePath);
+ await writeFile(
+ path.join(root, 'source-status.json'),
+ JSON.stringify({
+ status: 'ready',
+ path: sourcePath,
+ branch: 'cindy-personal',
+ ref: 'main',
+ commit: 'a'.repeat(40),
+ baseCommit: 'b'.repeat(40),
+ }),
+ );
+ const env = { processEnvironment: () => ({}) } as MakeToolchainEnvironment;
+ vi.mocked(runSourceGit).mockImplementation(async (_env, args) => {
+ if (args[0] === 'merge-base') return 'b'.repeat(40);
+ if (args[0] === 'rev-parse' && args[1] === '--verify') return 'c'.repeat(40);
+ if (args[0] === 'rev-parse' && args[1] === '--abbrev-ref') return 'cindy-personal';
+ if (args[0] === 'rev-list') return '0\t2';
+ throw new Error('not available');
+ });
+ await expect(readCurrentCindySourceStatus(root, env)).resolves.toMatchObject({
+ status: 'ready',
+ branch: 'cindy-personal',
+ baseCommit: 'b'.repeat(40),
+ mainCommit: 'c'.repeat(40),
+ currentBranch: 'cindy-personal',
+ });
+ await expect(readCindySourceStatus(root)).resolves.toMatchObject({
+ status: 'ready',
+ });
+ await expect(readCindySourceStatus(root)).resolves.not.toHaveProperty('mainCommit');
+ expect(vi.mocked(runSourceGit).mock.calls.some(([, args]) => args[0] === 'fetch')).toBe(false);
+ expect(vi.mocked(runSourceGit).mock.calls.some(([, args]) => args[0] === 'checkout')).toBe(
+ false,
+ );
+ });
+
+ it('does not invent a personal source version when the legacy status has no baseline', async () => {
+ const sourcePath = path.join(root, 'source');
+ await createExistingCheckout(sourcePath);
+ await writeFile(
+ path.join(root, 'source-status.json'),
+ JSON.stringify({ status: 'ready', path: sourcePath, branch: 'cindy-personal' }),
+ );
+ const env = { processEnvironment: () => ({}) } as MakeToolchainEnvironment;
+ vi.mocked(runSourceGit).mockImplementation(async (_env, args) => {
+ if (args[0] === 'rev-parse' && args[1] === 'HEAD') return 'a'.repeat(40);
+ if (args[0] === 'rev-parse' && args[1] === '--verify') return 'b'.repeat(40);
+ if (args[0] === 'rev-parse' && args[1] === '--abbrev-ref') return 'cindy-personal';
+ throw new Error('not available');
+ });
+ await expect(readCurrentCindySourceStatus(root, env)).resolves.toMatchObject({
+ status: 'ready',
+ branch: 'cindy-personal',
+ baseCommit: undefined,
+ mainCommit: 'b'.repeat(40),
+ currentBranch: 'cindy-personal',
+ });
+ });
+
it.each(['missing', 'failed', 'timeout'] as const)(
'reports unavailable Git (%s) without accessing the remote',
async (status) => {
@@ -186,10 +497,10 @@ describe('Git-only source preparation', () => {
it('keeps an existing personal branch and never resets it to upstream', async () => {
const sourcePath = path.join(root, 'source');
- await mkdir(path.join(sourcePath, '.git'), { recursive: true });
+ await createExistingCheckout(sourcePath);
const env = {
platform: 'win32',
- probe: vi.fn(async () => ({ status: 'ok', stdout: 'git version 2.45.0', path: 'git' })),
+ probe: vi.fn(probeReadyTool),
processEnvironment: () => ({}),
} as unknown as MakeToolchainEnvironment;
vi.mocked(runSourceGit).mockImplementation(async (_env, args) => {
@@ -200,7 +511,13 @@ describe('Git-only source preparation', () => {
return CINDY_SOURCE_REPOSITORY;
case 'branch':
return ' cindy-personal';
+ case 'merge-base':
+ return 'abcdef0123456789';
+ case 'rev-list':
+ return '0\t3';
case 'rev-parse':
+ if (args.includes('refs/heads/main^{commit}')) return 'a'.repeat(40);
+ if (args.includes('refs/remotes/origin/main^{commit}')) return 'b'.repeat(40);
return args[1] === 'HEAD' ? 'fedcba9876543210' : '0123456789abcdef';
default:
return '';
@@ -215,28 +532,156 @@ describe('Git-only source preparation', () => {
expect(result).toMatchObject({
status: 'ready',
commit: 'fedcba9876543210',
- baseCommit: '0123456789abcdef',
+ baseCommit: 'abcdef0123456789',
branch: 'cindy-personal',
+ mainCommit: 'a'.repeat(40),
+ mainRemoteCommit: 'b'.repeat(40),
+ mainBehind: 3,
+ mainAhead: 0,
});
const commands = vi.mocked(runSourceGit).mock.calls.map(([, args]) => args);
expect(commands.some((args) => args[0] === 'branch' && args[1] === 'cindy-personal')).toBe(
false,
);
expect(commands.some((args) => args[0] === 'reset')).toBe(false);
- expect(commands.some((args) => args[0] === 'rev-list')).toBe(false);
+ expect(commands).toContainEqual(['merge-base', 'fedcba9876543210', '0123456789abcdef']);
+ await expect(readCindySourceStatus(root)).resolves.toMatchObject({
+ status: 'ready',
+ });
+ await expect(readCindySourceStatus(root)).resolves.not.toHaveProperty('baseCommit');
+ await expect(readCindySourceStatus(root)).resolves.not.toHaveProperty('mainCommit');
});
+ it.each(['main', 'origin/main', 'comparison'])(
+ 'finishes source preparation when %s metadata cannot be read',
+ async (missing) => {
+ await createExistingCheckout(path.join(root, 'source'));
+ const env = {
+ platform: 'darwin',
+ probe: vi.fn(probeReadyTool),
+ processEnvironment: () => ({}),
+ } as unknown as MakeToolchainEnvironment;
+ vi.mocked(runSourceGit).mockImplementation(async (_env, args) => {
+ if (
+ (missing === 'main' && args.includes('refs/heads/main^{commit}')) ||
+ (missing === 'origin/main' && args.includes('refs/remotes/origin/main^{commit}')) ||
+ (missing === 'comparison' && args[0] === 'rev-list')
+ )
+ throw new Error('metadata unavailable');
+ if (args[0] === 'ls-remote') return '0123456789abcdef\trefs/heads/main';
+ if (args[0] === 'remote') return CINDY_SOURCE_REPOSITORY;
+ if (args[0] === 'rev-parse' || args[0] === 'merge-base') return '0123456789abcdef';
+ return '';
+ });
+ const progress = vi.fn();
+ const broadcast = vi.fn();
+ const unsubscribe = subscribeCindySourceStatus(broadcast);
+ try {
+ const result = await prepareCindySource(
+ env,
+ root,
+ { channel: 'dev', version: '0.0.0' },
+ new AbortController().signal,
+ progress,
+ );
+ expect(result.status).toBe('ready');
+ expect(result.baseCommit).toBe('0123456789abcdef');
+ expect(result.mainBehind).toBeUndefined();
+ expect(result.mainAhead).toBeUndefined();
+ expect(progress).toHaveBeenLastCalledWith(result);
+ expect(broadcast).toHaveBeenLastCalledWith(
+ expect.objectContaining({
+ status: 'ready',
+ baseCommit: result.baseCommit,
+ mainCommit: result.mainCommit,
+ mainRemoteCommit: result.mainRemoteCommit,
+ mainBehind: undefined,
+ }),
+ );
+ const restored = await readCindySourceStatus(root);
+ expect(restored.status).toBe('ready');
+ expect(restored).not.toHaveProperty('mainCommit');
+ expect(restored).not.toHaveProperty('mainRemoteCommit');
+ expect(restored).not.toHaveProperty('mainBehind');
+ } finally {
+ unsubscribe();
+ }
+ },
+ );
+
+ it.each([
+ { mainCommit: 'not-a-hash', mainRemoteCommit: {}, mainBehind: -1, mainAhead: 1.5 },
+ {
+ mainCommit: [],
+ mainRemoteCommit: 'refs/heads/main',
+ mainBehind: '0',
+ mainAhead: Number.MAX_SAFE_INTEGER + 1,
+ },
+ ])(
+ 'discards invalid persisted revision fields without losing checkout status',
+ async (fields) => {
+ await writeFile(
+ path.join(root, 'source-status.json'),
+ JSON.stringify({
+ status: 'ready',
+ path: path.join(root, 'source'),
+ branch: 'cindy-personal',
+ ...fields,
+ }),
+ );
+ const restored = await readCindySourceStatus(root);
+ expect(restored.status).toBe('ready');
+ for (const field of ['mainCommit', 'mainRemoteCommit', 'mainBehind', 'mainAhead']) {
+ expect(restored).not.toHaveProperty(field);
+ }
+ },
+ );
+
+ it.each(['main', 'feature/personal', null])(
+ 'does not restore the current checkout branch %s from the status file',
+ async (currentBranch) => {
+ await writeFile(
+ path.join(root, 'source-status.json'),
+ JSON.stringify({
+ status: 'ready',
+ path: path.join(root, 'source'),
+ branch: 'cindy-personal',
+ currentBranch,
+ }),
+ );
+ await expect(readCindySourceStatus(root)).resolves.not.toHaveProperty('currentBranch');
+ },
+ );
+
+ it.each([{}, 3, 'invalid\nbranch', 'a'.repeat(256)])(
+ 'ignores an invalid persisted current branch %s',
+ async (currentBranch) => {
+ await writeFile(
+ path.join(root, 'source-status.json'),
+ JSON.stringify({
+ status: 'ready',
+ path: path.join(root, 'source'),
+ branch: 'cindy-personal',
+ currentBranch,
+ }),
+ );
+ const restored = await readCindySourceStatus(root);
+ expect(restored.currentBranch).toBeUndefined();
+ },
+ );
+
it('refuses a dirty managed checkout instead of discarding its changes', async () => {
const sourcePath = path.join(root, 'source');
- await mkdir(path.join(sourcePath, '.git'), { recursive: true });
+ await createExistingCheckout(sourcePath);
const env = {
platform: 'win32',
- probe: vi.fn(async () => ({ status: 'ok', stdout: 'git version 2.45.0', path: 'git' })),
+ probe: vi.fn(probeReadyTool),
processEnvironment: () => ({}),
} as unknown as MakeToolchainEnvironment;
vi.mocked(runSourceGit).mockImplementation(async (_env, args) => {
if (args[0] === 'ls-remote') return '0123456789abcdef\trefs/heads/main';
if (args[0] === 'remote') return CINDY_SOURCE_REPOSITORY;
+ if (args[0] === 'for-each-ref') return 'refs/heads/main';
if (args[0] === 'status') return ' M apps/desktop/src/x.ts';
return '';
});
@@ -255,7 +700,7 @@ describe('Git-only source preparation', () => {
await mkdir(path.join(sourcePath, 'node_modules', 'leftover'), { recursive: true });
const env = {
platform: 'win32',
- probe: vi.fn(async () => ({ status: 'ok', stdout: 'git version 2.45.0', path: 'git' })),
+ probe: vi.fn(probeReadyTool),
processEnvironment: () => ({}),
} as unknown as MakeToolchainEnvironment;
vi.mocked(runSourceGit).mockImplementation(async (_env, args) => {
@@ -264,7 +709,7 @@ describe('Git-only source preparation', () => {
await expect(access(sourcePath)).rejects.toThrow();
return '';
}
- if (args[0] === 'rev-parse') return '0123456789abcdef';
+ if (args[0] === 'rev-parse') return '0123456789abcdef0123456789abcdef01234567';
return '';
});
const result = await prepareCindySource(
@@ -277,12 +722,43 @@ describe('Git-only source preparation', () => {
expect(vi.mocked(runSourceGit).mock.calls.some(([, args]) => args[0] === 'clone')).toBe(true);
});
- it('attaches a concurrent caller to the running job instead of starting a second one', async () => {
+ it('rebuilds an incomplete existing checkout instead of treating it as dirty', async () => {
const sourcePath = path.join(root, 'source');
await mkdir(path.join(sourcePath, '.git'), { recursive: true });
const env = {
platform: 'win32',
- probe: vi.fn(async () => ({ status: 'ok', stdout: 'git version 2.45.0', path: 'git' })),
+ probe: vi.fn(probeReadyTool),
+ processEnvironment: () => ({}),
+ } as unknown as MakeToolchainEnvironment;
+ vi.mocked(runSourceGit).mockImplementation(async (_env, args) => {
+ if (args[0] === 'ls-remote') return '0123456789abcdef\trefs/heads/main';
+ if (args[0] === 'remote') return CINDY_SOURCE_REPOSITORY;
+ if (args[0] === 'for-each-ref') return 'refs/heads/main';
+ if (args[0] === 'clone') {
+ await expect(access(sourcePath)).rejects.toThrow();
+ return '';
+ }
+ if (args[0] === 'rev-parse') return '0123456789abcdef0123456789abcdef01234567';
+ return '';
+ });
+
+ const result = await prepareCindySource(
+ env,
+ root,
+ { channel: 'dev', version: '0.0.0' },
+ new AbortController().signal,
+ );
+
+ expect(result).toMatchObject({ status: 'ready' });
+ expect(vi.mocked(runSourceGit).mock.calls.some(([, args]) => args[0] === 'clone')).toBe(true);
+ });
+
+ it('attaches a concurrent caller to the running job instead of starting a second one', async () => {
+ const sourcePath = path.join(root, 'source');
+ await createExistingCheckout(sourcePath);
+ const env = {
+ platform: 'win32',
+ probe: vi.fn(probeReadyTool),
processEnvironment: () => ({}),
} as unknown as MakeToolchainEnvironment;
let releaseFetch!: () => void;
diff --git a/apps/desktop/src/main/cindy-make/__tests__/sourceRevisions.git-integration.test.ts b/apps/desktop/src/main/cindy-make/__tests__/sourceRevisions.git-integration.test.ts
new file mode 100644
index 0000000000..d13d06d64e
--- /dev/null
+++ b/apps/desktop/src/main/cindy-make/__tests__/sourceRevisions.git-integration.test.ts
@@ -0,0 +1,84 @@
+import { mkdtemp, rm } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { expect, it } from 'vitest';
+import { runSourceGit } from '../sourceGit.js';
+import { readSourceRevisions } from '../sourceRevisions.js';
+import type { MakeToolchainEnvironment } from '../toolchainEnvironment.js';
+
+it('reads real Git ancestry and divergence without moving personal or main branches', async () => {
+ const root = await mkdtemp(path.join(os.tmpdir(), 'cindy-source-revisions-'));
+ const processEnvironment: NodeJS.ProcessEnv = {
+ PATH: process.env.PATH,
+ SystemRoot: process.env.SystemRoot,
+ HOME: root,
+ USERPROFILE: root,
+ XDG_CONFIG_HOME: root,
+ GIT_CONFIG_GLOBAL: os.devNull,
+ GIT_CONFIG_NOSYSTEM: '1',
+ GIT_AUTHOR_NAME: 'Source Test',
+ GIT_AUTHOR_EMAIL: '[email protected]',
+ GIT_COMMITTER_NAME: 'Source Test',
+ GIT_COMMITTER_EMAIL: '[email protected]',
+ };
+ const env = { processEnvironment: () => processEnvironment } as MakeToolchainEnvironment;
+ const signal = new AbortController().signal;
+ const git = (args: string[]) => runSourceGit(processEnvironment, args, root, signal);
+ const commit = async (message: string) => {
+ await git(['commit', '--allow-empty', '--no-gpg-sign', '-m', message]);
+ return git(['rev-parse', 'HEAD']);
+ };
+ try {
+ await git(['init', '--initial-branch=main']);
+ const base = await commit('base');
+ await git(['checkout', '-b', 'cindy-personal']);
+ const personal = await commit('personal');
+ await git(['checkout', 'main']);
+ await commit('upstream one');
+ const remote = await commit('upstream two');
+ await git(['update-ref', 'refs/remotes/origin/main', remote]);
+ await git(['checkout', 'cindy-personal']);
+ await git(['branch', '--force', 'main', base]);
+ const read = () => readSourceRevisions(env, root, personal, remote, signal);
+ await expect(read()).resolves.toEqual({
+ baseCommit: base,
+ currentBranch: 'cindy-personal',
+ mainCommit: base,
+ mainRemoteCommit: remote,
+ mainAhead: 0,
+ mainBehind: 2,
+ });
+ await git(['checkout', 'main']);
+ const local = await commit('local main only');
+ await expect(read()).resolves.toMatchObject({ currentBranch: 'main' });
+ await git(['checkout', 'cindy-personal']);
+ await expect(read()).resolves.toMatchObject({
+ baseCommit: base,
+ mainCommit: local,
+ mainRemoteCommit: remote,
+ mainAhead: 1,
+ mainBehind: 2,
+ });
+ expect(await git(['rev-parse', 'HEAD'])).toBe(personal);
+ expect(await git(['rev-parse', 'main'])).toBe(local);
+ await git(['checkout', '--detach', personal]);
+ await expect(read()).resolves.toMatchObject({ currentBranch: null });
+ await git(['checkout', 'cindy-personal']);
+ await git(['branch', '--delete', '--force', 'main']);
+ const withoutMain = await read();
+ expect(withoutMain.baseCommit).toBe(base);
+ expect(withoutMain.mainCommit).toBeUndefined();
+ expect(withoutMain.mainBehind).toBeUndefined();
+ await git(['branch', 'main', remote]);
+ await expect(read()).resolves.toMatchObject({ mainAhead: 0, mainBehind: 0 });
+ await git(['merge', '--no-edit', '--no-gpg-sign', 'main']);
+ const updatedPersonal = await git(['rev-parse', 'HEAD']);
+ await expect(
+ readSourceRevisions(env, root, updatedPersonal, remote, signal),
+ ).resolves.toMatchObject({
+ baseCommit: remote,
+ });
+ } finally {
+ await rm(root, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+ }
+}, 60_000);
diff --git a/apps/desktop/src/main/cindy-make/__tests__/sourceRevisions.test.ts b/apps/desktop/src/main/cindy-make/__tests__/sourceRevisions.test.ts
new file mode 100644
index 0000000000..58721e744a
--- /dev/null
+++ b/apps/desktop/src/main/cindy-make/__tests__/sourceRevisions.test.ts
@@ -0,0 +1,129 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { readSourceRevisions } from '../sourceRevisions.js';
+import { runSourceGit } from '../sourceGit.js';
+import type { MakeToolchainEnvironment } from '../toolchainEnvironment.js';
+
+vi.mock('../sourceGit.js', () => ({ runSourceGit: vi.fn() }));
+
+const personal = 'a'.repeat(40);
+const baseline = 'b'.repeat(40);
+const localMain = 'c'.repeat(40);
+const remoteMain = 'd'.repeat(40);
+const env = { processEnvironment: () => ({}) } as MakeToolchainEnvironment;
+let outputs: Record<string, string | Error>;
+
+beforeEach(() => {
+ outputs = {
+ ['merge-base ' + personal + ' ' + remoteMain]: baseline,
+ 'rev-parse --verify refs/heads/main^{commit}': localMain,
+ 'rev-parse --verify refs/remotes/origin/main^{commit}': remoteMain,
+ 'rev-parse --abbrev-ref HEAD': 'main',
+ ['rev-list --left-right --count ' + localMain + '...' + remoteMain]: '0 4',
+ };
+ vi.mocked(runSourceGit)
+ .mockReset()
+ .mockImplementation(async (_env, args) => {
+ const result = outputs[args.join(' ')];
+ if (result instanceof Error) throw result;
+ if (result === undefined) throw new Error('Unexpected Git query: ' + args.join(' '));
+ return result;
+ });
+});
+
+const read = (signal = new AbortController().signal) =>
+ readSourceRevisions(env, 'managed-source', personal, remoteMain, signal);
+
+describe('source revision snapshot', () => {
+ it('distinguishes the personal ancestor, local main, and fetched origin/main', async () => {
+ await expect(read()).resolves.toEqual({
+ baseCommit: baseline,
+ currentBranch: 'main',
+ mainCommit: localMain,
+ mainRemoteCommit: remoteMain,
+ mainBehind: 4,
+ mainAhead: 0,
+ });
+ expect(runSourceGit).toHaveBeenCalledTimes(5);
+ expect(vi.mocked(runSourceGit).mock.calls.every(([, , cwd]) => cwd === 'managed-source')).toBe(
+ true,
+ );
+ });
+
+ it.each([
+ [0, 0],
+ [2, 0],
+ [2, 3],
+ ])('keeps ahead=%i and behind=%i distinct', async (ahead, behind) => {
+ outputs['rev-list --left-right --count ' + localMain + '...' + remoteMain] =
+ ahead + ' ' + behind;
+ await expect(read()).resolves.toMatchObject({ mainAhead: ahead, mainBehind: behind });
+ });
+
+ it.each(['refs/heads/main', 'refs/remotes/origin/main'])(
+ 'does not fail preparation or invent a comparison when %s is missing',
+ async (ref) => {
+ outputs['rev-parse --verify ' + ref + '^{commit}'] = new Error('missing ref');
+ const result = await read();
+ expect(result.baseCommit).toBe(baseline);
+ expect(result.mainBehind).toBeUndefined();
+ expect(result.mainAhead).toBeUndefined();
+ expect(result[ref === 'refs/heads/main' ? 'mainCommit' : 'mainRemoteCommit']).toBeUndefined();
+ expect(runSourceGit).toHaveBeenCalledTimes(4);
+ },
+ );
+
+ it('does not substitute the latest upstream commit for an unknown personal ancestor', async () => {
+ outputs['merge-base ' + personal + ' ' + remoteMain] = new Error('unrelated histories');
+ await expect(read()).resolves.toMatchObject({ baseCommit: undefined, mainBehind: 4 });
+ });
+
+ it.each(['', '-1 2', '0 1.5', '0 9007199254740992', 'failed', new Error('count failed')])(
+ 'omits unavailable or invalid comparison counts: %s',
+ async (output) => {
+ outputs['rev-list --left-right --count ' + localMain + '...' + remoteMain] = output;
+ const result = await read();
+ expect(result.mainCommit).toBe(localMain);
+ expect(result.mainBehind).toBeUndefined();
+ expect(result.mainAhead).toBeUndefined();
+ },
+ );
+
+ it('ignores invalid commit output', async () => {
+ outputs['rev-parse --verify refs/heads/main^{commit}'] = 'refs/heads/main';
+ await expect(read()).resolves.toMatchObject({
+ mainCommit: undefined,
+ mainRemoteCommit: remoteMain,
+ });
+ });
+
+ it.each(['main', 'cindy-personal', 'feature/personal-change', '个人版'])(
+ 'reads the actual checkout branch %s',
+ async (branch) => {
+ outputs['rev-parse --abbrev-ref HEAD'] = branch;
+ await expect(read()).resolves.toMatchObject({ currentBranch: branch });
+ },
+ );
+
+ it('distinguishes a detached checkout from an unavailable branch name', async () => {
+ outputs['rev-parse --abbrev-ref HEAD'] = 'HEAD';
+ await expect(read()).resolves.toMatchObject({ currentBranch: null });
+ });
+
+ it.each(['', 'invalid\nbranch', 'a'.repeat(256), new Error('branch unavailable')])(
+ 'does not invent a current branch for %s',
+ async (value) => {
+ outputs['rev-parse --abbrev-ref HEAD'] = value;
+ await expect(read()).resolves.toMatchObject({ currentBranch: undefined });
+ },
+ );
+
+ it('propagates cancellation during an optional query', async () => {
+ const controller = new AbortController();
+ vi.mocked(runSourceGit).mockImplementationOnce(async () => {
+ controller.abort();
+ throw new Error('cancelled');
+ });
+ await expect(read(controller.signal)).rejects.toThrow();
+ expect(runSourceGit).toHaveBeenCalledTimes(1);
+ });
+});
diff --git a/apps/desktop/src/main/cindy-make/__tests__/taskWorkspace.test.ts b/apps/desktop/src/main/cindy-make/__tests__/taskWorkspace.test.ts
index 9e4d4b1f96..cd739b6450 100644
--- a/apps/desktop/src/main/cindy-make/__tests__/taskWorkspace.test.ts
+++ b/apps/desktop/src/main/cindy-make/__tests__/taskWorkspace.test.ts
@@ -46,7 +46,7 @@ describe('prepareCindyMakeWorkspace', () => {
);
expect(pnpm).toHaveBeenCalledWith(
expect.anything(),
- ['install', '--prefer-offline'],
+ ['install', '--frozen-lockfile', '--prefer-offline', '--prod=false'],
worktreePath,
expect.anything(),
);
diff --git a/apps/desktop/src/main/cindy-make/__tests__/toolProvisioning.test.ts b/apps/desktop/src/main/cindy-make/__tests__/toolProvisioning.test.ts
index 3113ebb849..4c9eb4ea40 100644
--- a/apps/desktop/src/main/cindy-make/__tests__/toolProvisioning.test.ts
+++ b/apps/desktop/src/main/cindy-make/__tests__/toolProvisioning.test.ts
@@ -5,7 +5,10 @@ import { mkdir, mkdtemp, readFile, readdir, rm, writeFile } from 'node:fs/promis
import { DownloadError } from '../../downloader/index.js';
import { makeToolCatalog } from '../toolCatalog.js';
import { installedMakeTool, installMakeTool } from '../toolInstaller.js';
-import { selectMakeToolchainEnvironment } from '../toolchainEnvironment.js';
+import {
+ resolveMakeToolEnvironment,
+ selectMakeToolchainEnvironment,
+} from '../toolchainEnvironment.js';
import { makeToolProcessEnvironment } from '../doctorEnvironment.js';
vi.mock('../../logger.js', () => ({
@@ -147,6 +150,107 @@ describe('private, atomic tool installation', () => {
});
describe('compatible local tool reuse and scoped environment', () => {
+ it.each(['python', 'py'] as const)(
+ 'reuses a system Python available only through %s without a managed copy',
+ async (available) => {
+ const executable = path.win32.join('C:', 'System Python', 'python.exe');
+ const launcher = path.win32.join('C:', 'Windows', 'py.exe');
+ const commands: Array<[string, readonly string[]]> = [];
+ const env = selectMakeToolchainEnvironment(
+ (tools) => ({
+ platform: 'win32',
+ arch: 'x64',
+ native: vi.fn(),
+ storage: vi.fn(),
+ probe: async (command, args) => {
+ commands.push([command, args]);
+ if (command === 'python3' && !tools.python)
+ return {
+ status: 'ok',
+ stdout: 'Python 2.7.0',
+ path: path.win32.join('C:', 'old', 'python3.exe'),
+ };
+ if (tools.python) return { status: 'ok', stdout: 'Python 3.12.10', path: tools.python };
+ if (command !== available) return { status: 'missing', stdout: '' };
+ return {
+ status: 'ok',
+ path: available === 'py' ? launcher : executable,
+ stdout: args.includes('-c') ? executable + '\n' : 'Python 3.12.10',
+ };
+ },
+ }),
+ {},
+ (tools) => makeToolProcessEnvironment(tools, { PATH: '' }, 'win32', ''),
+ );
+ await expect(
+ resolveMakeToolEnvironment(env, ['python'], new AbortController().signal),
+ ).resolves.toMatchObject({ PYTHON: executable, npm_config_python: executable });
+ expect(commands.slice(0, 2)).toEqual([
+ ['python3', ['--version']],
+ ['python', ['--version']],
+ ]);
+ if (available === 'py') {
+ expect(commands.slice(2)).toEqual([
+ ['py', ['-3', '--version']],
+ ['py', ['-3', '-c', 'import sys; print(sys.executable)']],
+ ]);
+ }
+ },
+ );
+
+ it('selects cached Git, Node, pnpm and Python before taking the workspace environment snapshot', async () => {
+ const cached = {
+ git: path.join(temp, 'tools', 'git'),
+ node: path.join(temp, 'tools', 'node'),
+ pnpm: path.join(temp, 'tools', 'pnpm'),
+ python: path.join(temp, 'tools', 'python3'),
+ };
+ const commands: string[] = [];
+ const env = selectMakeToolchainEnvironment(
+ (tools) => ({
+ platform: 'linux',
+ arch: 'x64',
+ storage: vi.fn(),
+ native: vi.fn(),
+ probe: async (command) => {
+ commands.push(command);
+ const executable =
+ command === 'git'
+ ? tools.git
+ : command === 'node'
+ ? tools.node
+ : command === 'python3'
+ ? tools.python
+ : tools.pnpm;
+ if (!executable) return { status: 'missing', stdout: '' };
+ if (command === 'pnpm') expect(tools.node).toBe(cached.node);
+ return {
+ status: 'ok',
+ path: executable,
+ stdout:
+ command === 'git'
+ ? 'git version 2.45.0'
+ : command === 'node'
+ ? 'v24.16.0'
+ : command === 'python3'
+ ? 'Python 3.12.10'
+ : '10.33.2',
+ };
+ },
+ }),
+ cached,
+ (tools) => makeToolProcessEnvironment(tools, { PATH: '' }, 'linux', ''),
+ );
+ await expect(
+ resolveMakeToolEnvironment(
+ env,
+ ['git', 'node', 'pnpm', 'python'],
+ new AbortController().signal,
+ ),
+ ).resolves.toMatchObject({ PYTHON: cached.python, npm_config_python: cached.python });
+ expect(commands).toEqual(['git', 'git', 'node', 'node', 'pnpm', 'pnpm', 'python3', 'python3']);
+ });
+
it.each([
['win32', path.win32, 'C:\\existing\\bin', 'C:\\managed\\node\\node.exe'],
['linux', path.posix, '/existing/bin', '/managed/node/bin/node'],
diff --git a/apps/desktop/src/main/cindy-make/__tests__/upstreamInclusion.test.ts b/apps/desktop/src/main/cindy-make/__tests__/upstreamInclusion.test.ts
new file mode 100644
index 0000000000..9a8ab53d2a
--- /dev/null
+++ b/apps/desktop/src/main/cindy-make/__tests__/upstreamInclusion.test.ts
@@ -0,0 +1,177 @@
+import { describe, expect, it, vi } from 'vitest';
+import type { MakeRuntimeVersion, MakeUpstreamItem } from '../../../shared/cindyMakeDoctor';
+import { filterUpstreamCandidates, type UpstreamRuntimeDeps } from '../upstreamInclusion';
+
+const runtimeCommit = 'a'.repeat(40);
+const prCommit = 'b'.repeat(40);
+const headCommit = 'c'.repeat(40);
+const runtime: MakeRuntimeVersion = {
+ channel: 'release',
+ version: '1.2.3',
+ commit: runtimeCommit,
+ confidence: 'exact',
+};
+const candidate = (number = 1): MakeUpstreamItem => ({
+ number,
+ title: 'Related feature',
+ kind: 'pr',
+ state: 'open',
+ htmlUrl: 'https://github.com/makecindy/cindy/pull/' + number,
+});
+const detail = (number = 1, merged = true) => ({
+ number,
+ html_url: candidate(number).htmlUrl,
+ merged,
+ state: merged ? 'closed' : 'open',
+ base: { repo: { full_name: 'makecindy/cindy' } },
+ head: { sha: headCommit },
+ merge_commit_sha: prCommit,
+});
+const comparison = (status: 'ahead' | 'behind' | 'diverged') => ({
+ status,
+ base_commit: { sha: prCommit },
+ merge_base_commit: { sha: status === 'ahead' ? prCommit : runtimeCommit },
+ ahead_by: status === 'behind' ? 0 : 1,
+ behind_by: status === 'ahead' ? 0 : 1,
+ total_commits: 1,
+ commits: [{ commit: { message: 'Next commit' } }],
+});
+const run = (
+ read: (url: string) => Promise<Record<string, unknown>>,
+ deps: UpstreamRuntimeDeps = { runtime },
+ items = [candidate()],
+ signal = new AbortController().signal,
+) => filterUpstreamCandidates(items, read, signal, deps);
+
+describe('upstream PR inclusion', () => {
+ it.each(['release', 'beta', 'dev'] as const)(
+ 'filters merged PRs by the actual %s commit, not release/merge dates',
+ async (channel) => {
+ const read = vi.fn(async (url: string) =>
+ url.includes('/pulls/') ? detail() : comparison('ahead'),
+ );
+ const result = await run(read, { runtime: { ...runtime, channel } });
+ expect(result.items).toEqual([]);
+ expect(result.excludedIncluded).toBe(1);
+ expect(read).toHaveBeenCalledWith(
+ 'https://api.github.com/repos/makecindy/cindy/compare/' + prCommit + '...' + runtimeCommit,
+ );
+ expect(read.mock.calls.some(([url]) => /releases|tags|main/.test(url))).toBe(false);
+ },
+ );
+ it('keeps merged PRs that are newer than the running build, regardless of publication', async () => {
+ const result = await run(async (url) =>
+ url.includes('/pulls/') ? detail() : comparison('behind'),
+ );
+ expect(result.items).toMatchObject([{ state: 'merged', inclusion: 'notIncluded' }]);
+ });
+ it('uses the PR head, not GitHub test-merge commit, to exclude a running unmerged Dev branch', async () => {
+ const read = vi.fn(async () => detail(1, false));
+ const result = await run(read, { runtime: { ...runtime, channel: 'dev', commit: headCommit } });
+ expect(result.excludedIncluded).toBe(1);
+ expect(read).toHaveBeenCalledTimes(1);
+ });
+ it('retains a draft PR and compares its actual head', async () => {
+ const containsCommit = vi.fn(async () => 'notIncluded' as const);
+ const result = await run(async () => ({ ...detail(1, false), draft: true }), {
+ runtime,
+ containsCommit,
+ });
+ expect(result.items).toMatchObject([{ draft: true, state: 'open', inclusion: 'notIncluded' }]);
+ expect(containsCommit).toHaveBeenCalledWith(headCommit, expect.any(AbortSignal));
+ });
+ it('drops closed-unmerged PRs but does not drop candidates on malformed detail', async () => {
+ expect((await run(async () => ({ ...detail(), merged: false }))).items).toEqual([]);
+ expect(
+ (await run(async () => ({ ...detail(), base: { repo: { full_name: 'elsewhere/repo' } } })))
+ .items,
+ ).toMatchObject([{ inclusion: 'unknown' }]);
+ });
+ it.each(['diverged', 'missing', 'limited', 'reverted', 'bad-base', 'invalid-count'])(
+ 'retains uncertain %s ancestry instead of filtering it out',
+ async (reason) => {
+ const read = async (url: string) => {
+ if (url.includes('/pulls/')) return detail();
+ if (reason === 'missing') throw new Error('not found');
+ const value = comparison(reason === 'diverged' ? 'diverged' : 'ahead');
+ if (reason === 'limited') value.total_commits = 300;
+ if (reason === 'reverted')
+ value.commits[0].commit.message = 'Revert\nThis reverts commit ' + prCommit;
+ if (reason === 'bad-base') value.base_commit.sha = headCommit;
+ if (reason === 'invalid-count') value.behind_by = 1;
+ return value;
+ };
+ expect((await run(read)).items).toMatchObject([{ inclusion: 'unknown' }]);
+ },
+ );
+ it.each([
+ undefined,
+ { ...runtime, confidence: 'unknown' as const },
+ { ...runtime, commit: 'main' },
+ ])('keeps candidates without querying ancestry for uncertain identity: %j', async (identity) => {
+ const read = vi.fn(async () => detail());
+ const result = await run(read, { runtime: identity });
+ expect(result.items).toMatchObject([{ inclusion: 'unknown' }]);
+ expect(read).toHaveBeenCalledTimes(1);
+ });
+ it('invalidates all filtering if Dev changes during the query', async () => {
+ const isCurrent = vi.fn().mockResolvedValueOnce(true).mockResolvedValueOnce(false);
+ const result = await run(async () => detail(), {
+ runtime,
+ isCurrent,
+ containsCommit: async () => 'included',
+ });
+ expect(result.items).toMatchObject([{ inclusion: 'unknown' }]);
+ expect(result.runtime?.confidence).toBe('unknown');
+ expect(result.excludedIncluded).toBe(0);
+ });
+ it('refills results after exclusion and bounds lookups, with a partial-search indicator', async () => {
+ const items = Array.from({ length: 30 }, (_, index) => candidate(index + 1));
+ const read = vi.fn(async (url: string) => ({
+ ...detail(Number(url.split('/').at(-1))),
+ merge_commit_sha: runtimeCommit,
+ }));
+ const result = await run(read, { runtime }, items);
+ expect(result.items).toEqual([]);
+ expect(result.hasMore).toBe(true);
+ expect(result.excludedIncluded).toBe(20);
+ expect(read).toHaveBeenCalledTimes(20);
+ });
+ it('continues past included matches and caches repeated ancestry comparisons', async () => {
+ const read = vi.fn(async (url: string) => {
+ const number = Number(url.split('/').at(-1));
+ if (url.includes('/pulls/'))
+ return { ...detail(number), merge_commit_sha: number <= 6 ? runtimeCommit : prCommit };
+ return comparison('behind');
+ });
+ const result = await run(
+ read,
+ { runtime },
+ Array.from({ length: 15 }, (_, index) => candidate(index + 1)),
+ );
+ expect(result.items.map((item) => item.number)).toEqual([7, 8, 9, 10, 11]);
+ expect(result.excludedIncluded).toBe(6);
+ expect(result.hasMore).toBe(true);
+ expect(read.mock.calls.filter(([url]) => url.includes('/compare/'))).toHaveLength(1);
+ });
+ it('aborts an inclusion callback that ignores cancellation', async () => {
+ const controller = new AbortController();
+ const entered = vi.fn();
+ const pending = run(
+ async () => detail(),
+ {
+ runtime,
+ containsCommit: async () => {
+ entered();
+ return new Promise(() => {});
+ },
+ },
+ [candidate()],
+ controller.signal,
+ );
+ const rejected = expect(pending).rejects.toBeTruthy();
+ await vi.waitFor(() => expect(entered).toHaveBeenCalled());
+ controller.abort();
+ await rejected;
+ });
+});
diff --git a/apps/desktop/src/main/cindy-make/__tests__/upstreamQuery.test.ts b/apps/desktop/src/main/cindy-make/__tests__/upstreamQuery.test.ts
index d3a176c063..d5c78ca951 100644
--- a/apps/desktop/src/main/cindy-make/__tests__/upstreamQuery.test.ts
+++ b/apps/desktop/src/main/cindy-make/__tests__/upstreamQuery.test.ts
@@ -2,11 +2,12 @@ import { afterEach, describe, expect, it, vi } from 'vitest';
import { searchCindyUpstream, upstreamSearchTerms } from '../upstreamQuery.js';
const signal = () => new AbortController().signal;
-const issue = (number = 12) => ({
+const pullRequest = (number = 12) => ({
number,
title: 'Scrolling flickers',
state: 'open',
- html_url: `https://github.com/makecindy/cindy/issues/${number}`,
+ html_url: `https://github.com/makecindy/cindy/pull/${number}`,
+ pull_request: {},
body: 'A short reproduction',
updated_at: '2026-09-08T08:00:00Z',
user: { login: 'contributor' },
@@ -24,10 +25,10 @@ describe('Cindy upstream search', () => {
expect(upstreamSearchTerms('我希望修复消息流闪烁')).toEqual(['消息', '闪烁']);
const fetch = vi.fn(async () => json(page()));
await searchCindyUpstream('scrolling repo:elsewhere/private OR is:closed', signal(), { fetch });
- expect(fetch.mock.calls.length).toBeLessThanOrEqual(3);
+ expect(fetch.mock.calls.length).toBeLessThanOrEqual(6);
for (const [url, init] of fetch.mock.calls as unknown as [string, RequestInit][]) {
expect(new URL(url).searchParams.get('q')).toMatch(
- /^repo:makecindy\/cindy is:open in:title,body "[\p{L}\p{N}]+"$/u,
+ /^repo:makecindy\/cindy is:pr is:(open|merged) in:title,body "[\p{L}\p{N}]+"$/u,
);
expect(init.headers).not.toHaveProperty('authorization');
}
@@ -42,7 +43,13 @@ describe('Cindy upstream search', () => {
it('returns notFound only for a complete, valid empty result', async () => {
expect(
await searchCindyUpstream('scrolling', signal(), { fetch: async () => json(page()) }),
- ).toEqual({ status: 'notFound', items: [], terms: ['scrolling'] });
+ ).toEqual({
+ status: 'notFound',
+ items: [],
+ terms: ['scrolling'],
+ excludedIncluded: 0,
+ hasMore: false,
+ });
});
it.each([
{},
@@ -50,7 +57,12 @@ describe('Cindy upstream search', () => {
{ ...page(), incomplete_results: true },
{ ...page(), total_count: 1 },
page([{}]),
- page([{ ...issue(), html_url: 'https://example.com/issues/12' }]),
+ { ...page(), total_count: -1 },
+ { ...page(), total_count: 0.5 },
+ page([{ ...pullRequest(), html_url: 'https://example.com/pull/12' }]),
+ page([{ ...pullRequest(), pull_request: undefined }]),
+ page([{ ...pullRequest(), pull_request: [] }]),
+ page([{ ...pullRequest(), state: 'unexpected' }]),
])('does not mislabel incomplete or malformed data as no matches: %j', async (body) => {
expect(
await searchCindyUpstream('scrolling', signal(), { fetch: async () => json(body) }),
@@ -62,8 +74,8 @@ describe('Cindy upstream search', () => {
json(
page(
new URL(url).searchParams.get('q')?.includes('scrolling')
- ? [issue(1), issue(12)]
- : [issue(12)],
+ ? [pullRequest(1), pullRequest(12)]
+ : [pullRequest(12)],
),
),
});
@@ -74,12 +86,56 @@ describe('Cindy upstream search', () => {
summary: 'A short reproduction',
});
});
- it('rejects a closed item even if a mocked endpoint returns one', async () => {
- const closed = { ...issue(), state: 'closed' };
+ it('retains a closed PR with unknown inclusion if its detail cannot be verified', async () => {
+ const closed = { ...pullRequest(), state: 'closed' };
const result = await searchCindyUpstream('scrolling', signal(), {
fetch: async () => json(page([closed])),
});
- expect(result).toMatchObject({ status: 'failed', failure: 'invalidResponse' });
+ expect(result).toMatchObject({
+ status: 'found',
+ items: [{ state: 'unknown', inclusion: 'unknown' }],
+ });
+ });
+ it('does not describe a bounded search as exhaustive when all checked PRs are included', async () => {
+ const commit = 'a'.repeat(40);
+ const fetch = vi.fn(async (url: string) =>
+ new URL(url).pathname === '/search/issues'
+ ? json({ ...page([pullRequest()]), total_count: 100 })
+ : json({
+ ...pullRequest(),
+ merged: true,
+ state: 'closed',
+ merge_commit_sha: commit,
+ base: { repo: { full_name: 'makecindy/cindy' } },
+ }),
+ );
+ const result = await searchCindyUpstream('scrolling', signal(), {
+ fetch,
+ runtime: { channel: 'release', version: '1.0.0', commit, confidence: 'exact' },
+ });
+ expect(result).toMatchObject({
+ status: 'notFound',
+ items: [],
+ excludedIncluded: 1,
+ hasMore: true,
+ });
+ expect(fetch.mock.calls.filter(([url]) => url.includes('/pulls/'))).toHaveLength(1);
+ const queries = fetch.mock.calls
+ .filter(([url]) => url.includes('/search/issues'))
+ .map(([url]) => new URL(url).searchParams.get('q'));
+ expect(queries).toEqual([
+ 'repo:makecindy/cindy is:pr is:open in:title,body "scrolling"',
+ 'repo:makecindy/cindy is:pr is:merged in:title,body "scrolling"',
+ ]);
+ });
+ it('times out detail lookup rather than reporting unknown candidates as a completed query', async () => {
+ vi.useFakeTimers();
+ const pending = searchCindyUpstream('scrolling', signal(), {
+ fetch: async (url) =>
+ url.includes('/search/issues') ? json(page([pullRequest()])) : new Promise(() => {}),
+ });
+ await vi.advanceTimersByTimeAsync(25_000);
+ expect(await pending).toMatchObject({ status: 'failed', failure: 'timeout', items: [] });
});
it.each([403, 429, 503])('shows failure for GitHub HTTP %s', async (status) => {
expect(
diff --git a/apps/desktop/src/main/cindy-make/doctor.ts b/apps/desktop/src/main/cindy-make/doctor.ts
index 17a86ebada..830c29db02 100644
--- a/apps/desktop/src/main/cindy-make/doctor.ts
+++ b/apps/desktop/src/main/cindy-make/doctor.ts
@@ -87,6 +87,14 @@ function versionCheck(
}
/** Shared compatibility decision for system tools, cached tools, and staged installs. */
+export function makePythonProbeCandidates(platform: string): [string, string[]][] {
+ return [
+ ['python3', ['--version']],
+ ['python', ['--version']],
+ ...(platform === 'win32' ? [['py', ['-3', '--version']] as [string, string[]]] : []),
+ ];
+}
+
export function checkMakeToolVersion(
id: MakeToolId,
result: DoctorProbeResult,
@@ -171,13 +179,7 @@ export async function checkCindyMakeEnvironment(
break;
case 'python': {
// A working but old python3 must not hide a compatible python/Windows launcher.
- const candidates: [string, string[]][] = [
- ['python3', ['--version']],
- ['python', ['--version']],
- ...(env.platform === 'win32'
- ? [['py', ['-3', '--version']] as [string, string[]]]
- : []),
- ];
+ const candidates = makePythonProbeCandidates(env.platform);
check = { id, status: 'missing', reason: 'notFound' };
for (const [command, args] of candidates) {
if (signal.aborted) break;
diff --git a/apps/desktop/src/main/cindy-make/doctorCommand.ts b/apps/desktop/src/main/cindy-make/doctorCommand.ts
index 27184c2524..93a436459f 100644
--- a/apps/desktop/src/main/cindy-make/doctorCommand.ts
+++ b/apps/desktop/src/main/cindy-make/doctorCommand.ts
@@ -13,6 +13,11 @@ import {
type MakeUpstreamQuery,
} from '../../shared/cindyMakeDoctor.js';
import { searchCindyUpstream } from './upstreamQuery.js';
+import {
+ cindyMakeManager,
+ type CindyMakeOperationHandle,
+ type CindyMakeOperationKey,
+} from './manager.js';
export function createMakeDoctorCommand<T extends MakeDoctorEnvironment>(deps: {
name?: 'cindy-make-doctor' | 'cindy-make';
@@ -35,10 +40,6 @@ export function createMakeDoctorCommand<T extends MakeDoctorEnvironment>(deps: {
options?: { clearOnly?: boolean },
) => Promise<MakeDoctorReport>;
}): DesktopCommandDefinition {
- const active = new Map<
- string,
- { sender: number; controller: AbortController; source: boolean }
- >();
const name = deps.name ?? 'cindy-make-doctor';
return {
name,
@@ -81,37 +82,33 @@ export function createMakeDoctorCommand<T extends MakeDoctorEnvironment>(deps: {
throwIpcError('INVALID_PARAMS', 'Invalid doctor run id');
if (ctx.doctorAction !== undefined) {
if (ctx.doctorAction !== 'cancel') throwIpcError('INVALID_PARAMS', 'Invalid doctor action');
- const run = active.get(runId);
- // Source operations are global (Settings and the workflow share one job), so
- // any trusted window may stop them; diagnostics stay private to their window.
- if (run && !run.source && run.sender !== ctx.senderWebContentsId)
+ const cancelled = cindyMakeManager.cancel(runId, ctx.senderWebContentsId!);
+ if (cancelled === 'forbidden')
throwIpcError('INVALID_PARAMS', 'Doctor run belongs to another window');
- run?.controller.abort();
return { success: true };
}
- const sourceRun = ctx.makeAction !== undefined;
- // Tool provisioning must not run twice at once. Source-only runs may start
- // alongside it: sourcePreparation attaches them to one shared job.
- const toolRuns = [...active.values()].filter((run) => !run.source).length;
- if (
- active.has(runId) ||
- active.size >= 4 ||
- (name === 'cindy-make' && !sourceRun && toolRuns >= 1)
- )
- throwIpcError('DEVICE_BUSY', 'Doctor is already running');
- const controller = new AbortController();
+ const startedAt = Date.now();
+ const timeoutMs = name === 'cindy-make' ? 20 * 60_000 : 60_000;
// Presence (including empty text) distinguishes the chat workflow from Settings preparation.
const workflow = name === 'cindy-make' && ctx.makeRequest !== undefined && !ctx.makeAction;
- // Includes executable discovery/filesystem reads, not just child processes.
- const timeout = setTimeout(
- () => controller.abort('timeout'),
- name === 'cindy-make' ? 20 * 60_000 : 60_000,
- );
- active.set(runId, { sender: ctx.senderWebContentsId!, controller, source: sourceRun });
- let latest: MakeDoctorReport = {
+ const operationKey: CindyMakeOperationKey = ctx.makeAction
+ ? {
+ resource: 'source',
+ mode: ctx.makeAction === 'prepare-source' ? 'prepare' : 'clear',
+ forceManagedTools: ctx.forceManagedTools === true,
+ }
+ : {
+ resource: 'environment',
+ mode: name === 'cindy-make' ? 'prepare' : 'check',
+ forceManagedTools: ctx.forceManagedTools === true,
+ };
+ const initialReport: MakeDoctorReport = {
...initialDoctorReport(runId, '', ''),
mode: name === 'cindy-make' ? 'prepare' : 'check',
...(ctx.makeAction ? { checks: [] } : {}),
+ };
+ let latest: MakeDoctorReport = {
+ ...initialReport,
...(workflow ? { upstream: { status: 'pending', items: [] } as MakeUpstreamQuery } : {}),
};
let finished = false;
@@ -119,47 +116,91 @@ export function createMakeDoctorCommand<T extends MakeDoctorEnvironment>(deps: {
if (finished) return;
latest = {
...report,
+ runId,
+ mode: initialReport.mode,
...(workflow ? { upstream: report.upstream ?? latest.upstream } : {}),
...(ctx.forceManagedTools ? { forceManagedTools: true } : {}),
};
deps.publish(ctx, latest);
};
+ let managerOperation: CindyMakeOperationHandle<T>;
try {
- publish(latest);
- const env = await untilAborted(Promise.resolve(deps.environment(ctx)), controller.signal);
- if (ctx.makeAction === 'prepare-source' || ctx.makeAction === 'clear-source') {
- if (!deps.prepareSource)
- throwIpcError('UNSUPPORTED_CAPABILITY', 'Source preparation is unavailable');
- if (ctx.makeAction === 'clear-source') {
- const cleared = await deps.prepareSource(runId, env, controller.signal, publish, {
- clearOnly: true,
- });
- publish({ ...cleared, upstream: latest.upstream });
+ managerOperation = cindyMakeManager.claim<T>(
+ operationKey,
+ runId,
+ ctx.senderWebContentsId!,
+ (report) =>
+ publish(
+ workflow && report.status === 'completed' && isMakeEnvironmentReady(report)
+ ? { ...report, status: 'running' }
+ : report,
+ ),
+ );
+ } catch (error) {
+ if ((error as { code?: string })?.code === 'busy')
+ throwIpcError('DEVICE_BUSY', 'A Cindy Make operation is already running');
+ throw error;
+ }
+ let controller = managerOperation.controller;
+ // Includes executable discovery/filesystem reads, not just child processes.
+ let timeout = managerOperation.attached
+ ? undefined
+ : setTimeout(() => managerOperation.controller.abort('timeout'), timeoutMs);
+ let workflowOperation: ReturnType<typeof cindyMakeManager.startWorkflow> | undefined;
+ let sharedCompleted = false;
+ let sharedLatest = initialReport;
+ const publishShared = (report: MakeDoctorReport) => {
+ sharedLatest = {
+ ...report,
+ runId,
+ mode: initialReport.mode,
+ ...(ctx.forceManagedTools ? { forceManagedTools: true } : {}),
+ };
+ managerOperation.publish(sharedLatest);
+ };
+ try {
+ if (!managerOperation.attached) {
+ publishShared(initialReport);
+ const env = await untilAborted(Promise.resolve(deps.environment(ctx)), controller.signal);
+ if (ctx.makeAction === 'prepare-source' || ctx.makeAction === 'clear-source') {
+ if (!deps.prepareSource)
+ throwIpcError('UNSUPPORTED_CAPABILITY', 'Source preparation is unavailable');
+ const prepared = await deps.prepareSource(
+ runId,
+ env,
+ controller.signal,
+ publishShared,
+ ctx.makeAction === 'clear-source' ? { clearOnly: true } : undefined,
+ );
+ publishShared(prepared);
} else {
- // Source operations select/check Git themselves; build prerequisites
- // must not block a checkout or rerun the environment doctor.
- const prepared = await deps.prepareSource(runId, env, controller.signal, publish);
- publish(prepared);
+ const run = name === 'cindy-make' ? deps.prepare : checkCindyMakeEnvironment;
+ if (!run) throwIpcError('UNSUPPORTED_CAPABILITY', 'Tool preparation is unavailable');
+ const checked = await run(runId, env, controller.signal, (report) => {
+ if (!controller.signal.aborted) publishShared(report);
+ });
+ controller.signal.throwIfAborted();
+ publishShared(checked);
}
- return { success: true, doctorReport: latest };
+ managerOperation.complete(sharedLatest, env);
}
- const run = name === 'cindy-make' ? deps.prepare : checkCindyMakeEnvironment;
- if (!run) throwIpcError('UNSUPPORTED_CAPABILITY', 'Tool preparation is unavailable');
- const doctorReport = await run(runId, env, controller.signal, (report) => {
- if (controller.signal.aborted) return;
- // The workflow remains running until source preparation and search both finish.
- publish(
- workflow && report.status === 'completed' && isMakeEnvironmentReady(report)
- ? { ...report, status: 'running' }
- : report,
- );
- });
- controller.signal.throwIfAborted();
+ const doctorReport = await managerOperation.promise;
+ sharedCompleted = true;
+ clearTimeout(timeout);
+ managerOperation.unsubscribe();
if (
workflow &&
doctorReport.status === 'completed' &&
isMakeEnvironmentReady(doctorReport)
) {
+ workflowOperation = cindyMakeManager.startWorkflow(runId, ctx.senderWebContentsId!);
+ controller = workflowOperation.controller;
+ timeout = setTimeout(
+ () => controller.abort('timeout'),
+ Math.max(0, startedAt + timeoutMs - Date.now()),
+ );
+ const env = managerOperation.context;
+ if (!env) throwIpcError('INTERNAL', 'Prepared environment is unavailable');
if (!ctx.makeRequest?.trim()) {
publish({ ...doctorReport, upstream: { status: 'needsRequest', items: [] } });
} else {
@@ -231,25 +272,26 @@ export function createMakeDoctorCommand<T extends MakeDoctorEnvironment>(deps: {
}
return { success: true, doctorReport: latest };
} catch {
+ const failureBase = !managerOperation.attached && !sharedCompleted ? sharedLatest : latest;
const timedOut = controller.signal.reason === 'timeout';
const cancelled = controller.signal.aborted && !timedOut;
const doctorReport: MakeDoctorReport = {
- ...latest,
+ ...failureBase,
status: cancelled ? 'cancelled' : 'failed',
- ...(latest.source?.status === 'preparing'
+ ...(failureBase.source?.status === 'preparing'
? {
source: {
- ...latest.source,
+ ...failureBase.source,
status: cancelled ? ('cancelled' as const) : ('failed' as const),
error: cancelled ? ('cancelled' as const) : ('gitFailed' as const),
progress: undefined,
},
}
: {}),
- ...(latest.upstream?.status === 'searching'
+ ...(failureBase.upstream?.status === 'searching'
? {
upstream: {
- ...latest.upstream,
+ ...failureBase.upstream,
status: cancelled ? ('cancelled' as const) : ('failed' as const),
...(cancelled
? {}
@@ -257,7 +299,7 @@ export function createMakeDoctorCommand<T extends MakeDoctorEnvironment>(deps: {
},
}
: {}),
- checks: latest.checks.map((check) =>
+ checks: failureBase.checks.map((check) =>
['pending', 'checking', 'downloading', 'installing'].includes(check.status)
? {
...check,
@@ -268,12 +310,18 @@ export function createMakeDoctorCommand<T extends MakeDoctorEnvironment>(deps: {
: check,
),
};
- publish(doctorReport);
+ if (!managerOperation.attached && !sharedCompleted) {
+ publishShared(doctorReport);
+ managerOperation.complete(sharedLatest);
+ } else {
+ publish(doctorReport);
+ }
return { success: true, doctorReport: latest };
} finally {
finished = true;
clearTimeout(timeout);
- active.delete(runId);
+ managerOperation.unsubscribe();
+ workflowOperation?.complete();
}
},
};
diff --git a/apps/desktop/src/main/cindy-make/manager.ts b/apps/desktop/src/main/cindy-make/manager.ts
new file mode 100644
index 0000000000..f7d6511be4
--- /dev/null
+++ b/apps/desktop/src/main/cindy-make/manager.ts
@@ -0,0 +1,192 @@
+import type { CindyMakeGlobalState, MakeDoctorReport } from '../../shared/cindyMakeDoctor.js';
+
+export type CindyMakeOperationKey =
+ | { resource: 'environment'; mode: 'check' | 'prepare'; forceManagedTools: boolean }
+ | { resource: 'source'; mode: 'prepare' | 'clear'; forceManagedTools: boolean };
+
+export type CindyMakeStateListener = (state: CindyMakeGlobalState) => void;
+
+function keyId(key: CindyMakeOperationKey): string {
+ return [key.resource, key.mode, key.forceManagedTools ? 'managed' : 'system'].join(':');
+}
+
+function stateSlot(key: CindyMakeOperationKey): keyof CindyMakeGlobalState {
+ if (key.resource === 'environment')
+ return key.mode === 'check' ? 'environmentCheck' : 'environmentPrepare';
+ return key.mode === 'prepare' ? 'sourcePrepare' : 'sourceClear';
+}
+
+interface ActiveOperation {
+ controller: AbortController;
+ key: CindyMakeOperationKey;
+ keyId: string;
+ operationId: string;
+ participants: Set<number>;
+ context?: unknown;
+ latest?: MakeDoctorReport;
+ listeners: Set<(report: MakeDoctorReport) => void>;
+ aliases: Set<string>;
+ resolve: (report: MakeDoctorReport) => void;
+ promise: Promise<MakeDoctorReport>;
+}
+
+export interface CindyMakeOperationHandle<T = unknown> {
+ controller: AbortController;
+ operationId: string;
+ attached: boolean;
+ promise: Promise<MakeDoctorReport>;
+ publish: (report: MakeDoctorReport) => void;
+ readonly context?: T;
+ complete: (report: MakeDoctorReport, context?: T) => void;
+ unsubscribe: () => void;
+}
+
+/** Main-owned lifecycle for Cindy Make operations; renderer lifetime is never part of it. */
+export class CindyMakeManager {
+ private readonly active = new Map<string, ActiveOperation>();
+ private readonly aliases = new Map<string, ActiveOperation>();
+ private readonly workflows = new Map<string, { sender: number; controller: AbortController }>();
+ private readonly states: CindyMakeGlobalState = {};
+ private readonly stateListeners = new Set<CindyMakeStateListener>();
+
+ subscribe(listener: CindyMakeStateListener): () => void {
+ this.stateListeners.add(listener);
+ listener(this.getState());
+ return () => this.stateListeners.delete(listener);
+ }
+
+ getState(): CindyMakeGlobalState {
+ return { ...this.states };
+ }
+
+ claim<T = unknown>(
+ key: CindyMakeOperationKey,
+ operationId: string,
+ sender: number,
+ listener: (report: MakeDoctorReport) => void,
+ ): CindyMakeOperationHandle<T> {
+ if (this.aliases.has(operationId) || this.workflows.has(operationId))
+ throw Object.assign(new Error('already running'), { code: 'busy' });
+ const id = keyId(key);
+ const existing = this.active.get(id);
+ if (existing) {
+ const wrapped = (report: MakeDoctorReport) => listener({ ...report, runId: operationId });
+ existing.listeners.add(wrapped);
+ existing.participants.add(sender);
+ existing.aliases.add(operationId);
+ this.aliases.set(operationId, existing);
+ if (existing.latest) listener({ ...existing.latest, runId: operationId });
+ return {
+ controller: existing.controller,
+ operationId: existing.operationId,
+ attached: true,
+ promise: existing.promise.then((report) => ({ ...report, runId: operationId })),
+ get context() {
+ return existing.context as T | undefined;
+ },
+ publish: () => {},
+ complete: () => {},
+ unsubscribe: () => existing.listeners.delete(wrapped),
+ };
+ }
+
+ let resolve!: (report: MakeDoctorReport) => void;
+ const operation: ActiveOperation = {
+ controller: new AbortController(),
+ key,
+ keyId: id,
+ operationId,
+ participants: new Set([sender]),
+ listeners: new Set(),
+ aliases: new Set([operationId]),
+ resolve,
+ promise: new Promise<MakeDoctorReport>((resolvePromise) => {
+ resolve = resolvePromise;
+ }),
+ };
+ operation.resolve = resolve;
+ const wrapped = (report: MakeDoctorReport) => listener({ ...report, runId: operationId });
+ operation.listeners.add(wrapped);
+ this.active.set(id, operation);
+ this.aliases.set(operationId, operation);
+ let completed = false;
+ const complete = (report: MakeDoctorReport, context?: T) => {
+ if (completed) return;
+ completed = true;
+ operation.latest = report;
+ operation.context = context;
+ this.states[stateSlot(operation.key)] = { active: false, report };
+ this.active.delete(operation.keyId);
+ for (const alias of operation.aliases) this.aliases.delete(alias);
+ operation.resolve(report);
+ this.notify();
+ };
+ return {
+ controller: operation.controller,
+ operationId,
+ attached: false,
+ promise: operation.promise.then((report) => ({ ...report, runId: operationId })),
+ get context() {
+ return operation.context as T | undefined;
+ },
+ publish: (report) => {
+ if (completed) return;
+ operation.latest = report;
+ this.states[stateSlot(operation.key)] = { active: true, report };
+ this.notify();
+ for (const current of operation.listeners) current(report);
+ },
+ complete,
+ unsubscribe: () => operation.listeners.delete(wrapped),
+ };
+ }
+
+ startWorkflow(
+ operationId: string,
+ sender: number,
+ ): {
+ controller: AbortController;
+ complete: () => void;
+ } {
+ if (this.aliases.has(operationId) || this.workflows.has(operationId))
+ throw Object.assign(new Error('already running'), { code: 'busy' });
+ const workflow = { sender, controller: new AbortController() };
+ this.workflows.set(operationId, workflow);
+ return {
+ controller: workflow.controller,
+ complete: () => {
+ if (this.workflows.get(operationId) === workflow) this.workflows.delete(operationId);
+ },
+ };
+ }
+
+ cancel(operationId: string, sender: number): 'cancelled' | 'forbidden' | 'not-found' {
+ const operation = this.aliases.get(operationId);
+ if (!operation) {
+ const workflow = this.workflows.get(operationId);
+ if (!workflow) return 'not-found';
+ if (workflow.sender !== sender) return 'forbidden';
+ workflow.controller.abort('cancelled');
+ return 'cancelled';
+ }
+ if (
+ operation.key.resource === 'environment' &&
+ operation.key.mode === 'check' &&
+ !operation.participants.has(sender)
+ )
+ return 'forbidden';
+ if (!operation.controller.signal.aborted) operation.controller.abort('cancelled');
+ return 'cancelled';
+ }
+
+ snapshot(key: CindyMakeOperationKey): MakeDoctorReport | undefined {
+ return this.active.get(keyId(key))?.latest ?? this.states[stateSlot(key)]?.report;
+ }
+
+ private notify(): void {
+ const state = this.getState();
+ for (const listener of this.stateListeners) listener(state);
+ }
+}
+
+export const cindyMakeManager = new CindyMakeManager();
diff --git a/apps/desktop/src/main/cindy-make/runtimeVersion.ts b/apps/desktop/src/main/cindy-make/runtimeVersion.ts
new file mode 100644
index 0000000000..6b58391eee
--- /dev/null
+++ b/apps/desktop/src/main/cindy-make/runtimeVersion.ts
@@ -0,0 +1,112 @@
+import { execFile } from 'node:child_process';
+import type { MakeRuntimeVersion, MakeUpstreamInclusion } from '../../shared/cindyMakeDoctor';
+
+export interface RuntimeSourceBuild {
+ commit?: string;
+ dirty?: boolean;
+ root?: string;
+}
+
+const loadedBuild: RuntimeSourceBuild = import.meta.env.CINDY_RUNTIME_SOURCE ?? {};
+const validCommit = (value: unknown): value is string =>
+ typeof value === 'string' && /^[a-f0-9]{40}$/.test(value);
+
+export type RuntimeGit = (
+ root: string,
+ args: string[],
+ signal: AbortSignal,
+) => Promise<{ code: number; stdout: string }>;
+
+const runtimeGit: RuntimeGit = (root, args, signal) =>
+ new Promise((resolve) => {
+ execFile(
+ 'git',
+ args,
+ {
+ cwd: root,
+ signal,
+ encoding: 'utf8',
+ timeout: 3000,
+ maxBuffer: 256 * 1024,
+ windowsHide: true,
+ },
+ (error, stdout) =>
+ resolve({ code: error ? (typeof error.code === 'number' ? error.code : -1) : 0, stdout }),
+ );
+ });
+
+export async function resolveMakeRuntime(
+ input: { packaged: boolean; version: string },
+ signal: AbortSignal,
+ build: RuntimeSourceBuild = loadedBuild,
+ git: RuntimeGit = runtimeGit,
+) {
+ const runtime: MakeRuntimeVersion = {
+ channel: !input.packaged ? 'dev' : /-beta(?:\.|$)/i.test(input.version) ? 'beta' : 'release',
+ version: input.version,
+ ...(validCommit(build.commit) ? { commit: build.commit } : {}),
+ confidence: validCommit(build.commit) && build.dirty === false ? 'exact' : 'unknown',
+ };
+ const isCurrent = async () => {
+ if (runtime.confidence !== 'exact' || signal.aborted) return false;
+ if (input.packaged) return true;
+ if (!build.root) return false;
+ try {
+ const head = await git(build.root, ['rev-parse', 'HEAD'], signal);
+ const status = await git(
+ build.root,
+ ['status', '--porcelain=v1', '-z', '--untracked-files=normal'],
+ signal,
+ );
+ const unchanged =
+ head.code === 0 &&
+ head.stdout.trim() === build.commit &&
+ status.code === 0 &&
+ !status.stdout;
+ if (!unchanged) runtime.confidence = 'unknown';
+ return unchanged;
+ } catch {
+ return false;
+ }
+ };
+ if (!(await isCurrent())) runtime.confidence = 'unknown';
+ const containsCommit = async (
+ commit: string,
+ compareSignal = signal,
+ ): Promise<MakeUpstreamInclusion> => {
+ if (!validCommit(commit) || !(await isCurrent())) return 'unknown';
+ if (commit === runtime.commit) return 'included';
+ if (input.packaged || !build.root) return 'unknown';
+ try {
+ const included = await git(
+ build.root,
+ ['merge-base', '--is-ancestor', commit, runtime.commit!],
+ compareSignal,
+ );
+ if (included.code === 0) {
+ const reverts = await git(
+ build.root,
+ [
+ 'log',
+ '--format=%B',
+ `${commit}..${runtime.commit}`,
+ `--grep=${commit}`,
+ '--fixed-strings',
+ ],
+ compareSignal,
+ );
+ return reverts.code === 0 && !/revert/i.test(reverts.stdout) ? 'included' : 'unknown';
+ }
+ if (included.code !== 1) return 'unknown';
+ const later = await git(
+ build.root,
+ ['merge-base', '--is-ancestor', runtime.commit!, commit],
+ compareSignal,
+ );
+ return later.code === 0 ? 'notIncluded' : 'unknown';
+ } catch {
+ return 'unknown';
+ }
+ };
+ return { runtime, isCurrent, containsCommit };
+}
diff --git a/apps/desktop/src/main/cindy-make/sourceGit.ts b/apps/desktop/src/main/cindy-make/sourceGit.ts
index e73c80570d..23142c626d 100644
--- a/apps/desktop/src/main/cindy-make/sourceGit.ts
+++ b/apps/desktop/src/main/cindy-make/sourceGit.ts
@@ -1,6 +1,19 @@
import { spawn } from 'node:child_process';
+import { redactSensitiveText } from '@cindy/maker-shared/error-redaction';
import type { MakeSourceGitProgress } from '../../shared/cindyMakeDoctor.js';
+const MAX_CAPTURED_STDOUT = 64 * 1024;
+const MAX_CAPTURED_STDERR = 16 * 1024;
+
+function sanitizeProgressLine(line: string): string {
+ return redactSensitiveText(
+ line
+ .replace(/\x1B\[[0-?]*[ -/]*[@-~]/g, '')
+ .replace(/\b(?:https?|ssh):\/\/[^\s"'<>]+/gi, '[REDACTED_URL]')
+ .trim(),
+ ).slice(-512);
+}
+
export function parseSourceGitProgress(line: string): MakeSourceGitProgress | undefined {
const match =
/(?:^|remote:\s*)(Counting objects|Compressing objects|Receiving objects|Resolving deltas|Updating files):\s+(\d{1,3})%/.exec(
@@ -35,13 +48,22 @@ export async function runSourceGit(
signal,
});
let stdout = '';
+ let stderr = '';
+ let stderrTruncated = false;
let stderrTail = '';
let failed = false;
+ let spawnCode: string | undefined;
let latest: MakeSourceGitProgress | undefined;
let sent: MakeSourceGitProgress | undefined;
let lastSent = 0;
const publish = () => {
- if (!latest || (sent?.stage === latest.stage && sent.percent === latest.percent)) return;
+ if (
+ !latest ||
+ (sent?.stage === latest.stage &&
+ sent.percent === latest.percent &&
+ sent.message === latest.message)
+ )
+ return;
onProgress?.(latest);
sent = latest;
lastSent = Date.now();
@@ -50,19 +72,21 @@ export async function runSourceGit(
child.stderr.setEncoding('utf8');
child.stdout.on('data', (chunk: string) => {
if (failed) return;
- stdout += chunk;
- if (stdout.length > 64 * 1024) {
- failed = true;
- child.kill();
- }
+ if (stdout.length < MAX_CAPTURED_STDOUT)
+ stdout += chunk.slice(0, MAX_CAPTURED_STDOUT - stdout.length);
});
child.stderr.on('data', (chunk: string) => {
+ stderr += chunk;
const lines = (stderrTail + chunk).split(/[\r\n]/);
stderrTail = (lines.pop() ?? '').slice(-1024);
+ if (stderr.length > MAX_CAPTURED_STDERR) {
+ stderrTruncated = true;
+ stderr = stderr.slice(-MAX_CAPTURED_STDERR);
+ }
for (const line of lines) {
const progress = parseSourceGitProgress(line);
if (!progress) continue;
- latest = progress;
+ latest = { ...progress, message: sanitizeProgressLine(line) };
if (
sent?.stage !== progress.stage ||
progress.percent === 100 ||
@@ -71,15 +95,24 @@ export async function runSourceGit(
publish();
}
});
- child.on('error', () => {
+ child.on('error', (error: NodeJS.ErrnoException) => {
failed = true;
+ spawnCode = error.code;
});
// Wait for close, including abort/error paths, before another operation can touch the checkout.
- child.on('close', (code) => {
+ child.on('close', (code, exitSignal) => {
if (signal.aborted || failed || code !== 0) {
+ const diagnostic = stderrTruncated ? `[stderr truncated] ${stderr}` : stderr;
reject(
Object.assign(new Error('Git source operation failed'), {
code: signal.aborted ? 'cancelled' : 'gitFailed',
+ operation: args[0],
+ exitCode: code,
+ exitSignal,
+ spawnCode,
+ stderr: redactSensitiveText(
+ diagnostic.replace(/\b(?:https?|ssh):\/\/[^\s"'<>]+/gi, '[REDACTED_URL]'),
+ ).trim(),
}),
);
return;
diff --git a/apps/desktop/src/main/cindy-make/sourcePreparation.ts b/apps/desktop/src/main/cindy-make/sourcePreparation.ts
index d33f071ac1..31a295ecc1 100644
--- a/apps/desktop/src/main/cindy-make/sourcePreparation.ts
+++ b/apps/desktop/src/main/cindy-make/sourcePreparation.ts
@@ -1,15 +1,22 @@
-import { access, lstat, mkdir, readFile, stat, writeFile } from 'node:fs/promises';
+import { access, lstat, mkdir, mkdtemp, readFile, rename, stat, writeFile } from 'node:fs/promises';
import originalFs from 'original-fs';
import path from 'node:path';
-import type { MakeToolchainEnvironment } from './toolchainEnvironment.js';
+import { createLogger } from '../logger.js';
+import {
+ resolveMakeToolEnvironment,
+ type MakeToolchainEnvironment,
+} from './toolchainEnvironment.js';
import type { MakeSourceGitProgress, MakeSourceStatus } from '../../shared/cindyMakeDoctor.js';
import { runSourceGit } from './sourceGit.js';
+import { runSourcePnpm } from './sourcePnpm.js';
+import { readSourceRevisions, type SourceRevisions } from './sourceRevisions.js';
import { CINDY_PERSONAL_BRANCH } from './sourcePaths.js';
import { checkMakeToolVersion, untilAborted } from './doctor.js';
export const CINDY_SOURCE_REPOSITORY = 'https://github.com/makecindy/cindy.git';
export { makeSourceRoot, makeSourceCheckoutPath } from './sourcePaths.js';
const SOURCE_STATUS_FILE = 'source-status.json';
+const log = createLogger('cindy-make');
function sourceStatusPath(root: string): string {
return path.join(root, SOURCE_STATUS_FILE);
@@ -18,7 +25,16 @@ function sourceStatusPath(root: string): string {
async function persistSourceStatus(root: string, status: MakeSourceStatus): Promise<void> {
try {
await mkdir(root, { recursive: true });
- await writeFile(sourceStatusPath(root), `${JSON.stringify(status)}\n`, 'utf8');
+ const persisted = {
+ status: status.status,
+ path: status.path,
+ ...(status.channel ? { channel: status.channel } : {}),
+ ...(status.version ? { version: status.version } : {}),
+ ...(status.ref ? { ref: status.ref } : {}),
+ ...(status.error ? { error: status.error } : {}),
+ ...(status.phase ? { phase: status.phase } : {}),
+ };
+ await writeFile(sourceStatusPath(root), `${JSON.stringify(persisted)}\n`, 'utf8');
} catch {
// Status is auxiliary UI state; a failed write must not block source preparation.
}
@@ -47,16 +63,8 @@ export async function readCindySourceStatus(root: string): Promise<MakeSourceSta
...(parsed.channel ? { channel: parsed.channel } : {}),
...(parsed.version ? { version: parsed.version } : {}),
...(parsed.ref ? { ref: parsed.ref } : {}),
- ...(parsed.commit && /^[0-9a-f]{7,64}$/i.test(parsed.commit)
- ? { commit: parsed.commit }
- : {}),
- ...(parsed.branch === CINDY_PERSONAL_BRANCH ? { branch: parsed.branch } : {}),
- ...(parsed.baseCommit && /^[0-9a-f]{7,64}$/i.test(parsed.baseCommit)
- ? { baseCommit: parsed.baseCommit }
- : {}),
...(parsed.error ? { error: parsed.error } : {}),
...(parsed.phase ? { phase: parsed.phase } : {}),
- ...(parsed.progress ? { progress: parsed.progress } : {}),
};
} catch {
// Checkouts created before the status file was introduced remain visible.
@@ -95,9 +103,41 @@ export function subscribeCindySourceStatus(
* Status for the Settings card: live progress while a job runs; otherwise the
* persisted file, where a leftover "preparing" can only be an interrupted run.
*/
-export async function readCurrentCindySourceStatus(root: string): Promise<MakeSourceStatus> {
+export async function readCurrentCindySourceStatus(
+ root: string,
+ env?: MakeToolchainEnvironment,
+): Promise<MakeSourceStatus> {
if (inFlight?.status) return inFlight.status;
const status = await readCindySourceStatus(root);
+ if (status.status === 'ready' && env) {
+ const sourcePath = path.resolve(root, 'source');
+ if (env && (await exists(path.join(sourcePath, '.git')))) {
+ const signal = new AbortController().signal;
+ const personalCommit = await git(env, ['rev-parse', 'HEAD'], sourcePath, signal).catch(
+ () => '',
+ );
+ const upstreamRef = status.ref
+ ? status.ref === 'main'
+ ? 'refs/remotes/origin/main^{commit}'
+ : `refs/tags/${status.ref}^{commit}`
+ : undefined;
+ const upstreamCommit = upstreamRef
+ ? await git(env, ['rev-parse', '--verify', upstreamRef], sourcePath, signal).catch(() => '')
+ : undefined;
+ const revisions = await readSourceRevisions(
+ env,
+ sourcePath,
+ personalCommit,
+ upstreamCommit || undefined,
+ signal,
+ );
+ return {
+ ...status,
+ ...revisions,
+ branch: CINDY_PERSONAL_BRANCH,
+ };
+ }
+ }
if (status.status === 'preparing' && !inFlight) {
return {
...status,
@@ -126,7 +166,12 @@ function toSourceStatus(progress: SourcePreparationProgress): MakeSourceStatus {
ref: progress.target.ref,
...(progress.commit ? { commit: progress.commit } : {}),
...(progress.branch ? { branch: progress.branch } : {}),
+ currentBranch: progress.currentBranch,
...(progress.baseCommit ? { baseCommit: progress.baseCommit } : {}),
+ mainCommit: progress.mainCommit,
+ mainRemoteCommit: progress.mainRemoteCommit,
+ mainBehind: progress.mainBehind,
+ mainAhead: progress.mainAhead,
...(progress.error ? { error: progress.error } : {}),
...(progress.phase ? { phase: progress.phase } : {}),
...(progress.progress ? { progress: progress.progress } : {}),
@@ -146,26 +191,23 @@ export interface CindySourceTarget {
candidates: string[];
}
-export interface SourcePreparationResult {
+export interface SourcePreparationResult extends SourceRevisions {
status: 'ready' | 'failed' | 'cancelled';
path: string;
target: CindySourceTarget;
/** HEAD of the checkout: the personal baseline branch. */
commit?: string;
branch?: string;
- /** Upstream baseline commit for `target.ref` after this fetch. */
- baseCommit?: string;
error?: MakeSourceStatus['error'];
cleared?: boolean;
}
-export interface SourcePreparationProgress {
+export interface SourcePreparationProgress extends SourceRevisions {
status: 'preparing' | 'ready' | 'failed' | 'cancelled';
path: string;
target: CindySourceTarget;
commit?: string;
branch?: string;
- baseCommit?: string;
error?: SourcePreparationResult['error'];
phase?: MakeSourceStatus['phase'];
progress?: MakeSourceGitProgress;
@@ -271,6 +313,39 @@ async function removeManagedTree(dir: string): Promise<void> {
if (await exists(dir)) throw Object.assign(new Error('locked'), { code: 'locked' });
}
+async function isIncompleteManagedCheckout(
+ env: MakeToolchainEnvironment,
+ sourcePath: string,
+ ref: string,
+ signal: AbortSignal,
+): Promise<boolean> {
+ const gitDir = path.join(sourcePath, '.git');
+ if (!(await lstat(gitDir)).isDirectory()) return false;
+ try {
+ await lstat(path.join(gitDir, 'index'));
+ await lstat(path.join(sourcePath, 'package.json'));
+ return false;
+ } catch (error) {
+ if ((error as NodeJS.ErrnoException).code !== 'ENOENT') throw error;
+ }
+ if (
+ (await exists(path.join(gitDir, 'worktrees'))) ||
+ (await exists(path.join(path.dirname(sourcePath), 'worktrees')))
+ )
+ return false;
+ const branches = await git(
+ env,
+ ['for-each-ref', '--format=%(refname)', 'refs/heads', 'refs/stash'],
+ sourcePath,
+ signal,
+ );
+ if (branches.trim() !== (ref === 'main' ? 'refs/heads/main' : '')) return false;
+ const head = await git(env, ['rev-parse', 'HEAD'], sourcePath, signal);
+ const baselineRef = ref === 'main' ? 'origin/main' : 'refs/tags/' + ref;
+ const baseline = await git(env, ['rev-parse', baselineRef + '^{commit}'], sourcePath, signal);
+ return /^[0-9a-f]{40,64}$/i.test(head) && head === baseline;
+}
+
function gitErrorCode(error: unknown): SourcePreparationResult['error'] {
const code = (error as { code?: unknown } | null)?.code;
if (
@@ -380,19 +455,7 @@ async function prepareCindySourceInternal(
};
await persistSourceStatus(root, initialStatus);
const emitProgress = async (progress: SourcePreparationProgress) => {
- await persistSourceStatus(root, {
- status: progress.status,
- path: progress.path,
- channel: progress.target.channel,
- version: progress.target.version,
- ref: progress.target.ref,
- commit: progress.commit,
- branch: progress.branch,
- baseCommit: progress.baseCommit,
- error: progress.error,
- phase: progress.phase,
- progress: progress.progress,
- });
+ await persistSourceStatus(root, toSourceStatus(progress));
onProgress(progress);
};
await emitProgress({ status: 'preparing', path: sourcePath, target, phase: 'checking' });
@@ -404,8 +467,6 @@ async function prepareCindySourceInternal(
if ((await exists(gitDir)) && (await lstat(gitDir)).isSymbolicLink())
throw Object.assign(new Error('gitFailed'), { code: 'gitFailed' });
- // Probe through the shared selector so the checkout uses a working system
- // Git first, then Cindy's managed Git. No build tools are needed here.
if (!options.clearOnly || (await exists(sourcePath))) {
const probe = await untilAborted(env.probe('git', ['--version'], signal), signal);
if (checkMakeToolVersion('git', probe, env.platform).status !== 'passed')
@@ -453,6 +514,17 @@ async function prepareCindySourceInternal(
const remote = await git(env, ['remote', 'get-url', 'origin'], sourcePath, signal);
if (remote !== CINDY_SOURCE_REPOSITORY)
throw Object.assign(new Error('gitFailed'), { code: 'gitFailed' });
+ if (await isIncompleteManagedCheckout(env, sourcePath, resolvedRef, signal)) {
+ signal.throwIfAborted();
+ const backupRoot = await mkdtemp(path.join(root, 'source-incomplete-'));
+ const backupPath = path.join(backupRoot, 'source');
+ await rename(sourcePath, backupPath);
+ log.warn('cindy-make source checkout incomplete; backed up before rebuilding', {
+ backupPath,
+ });
+ }
+ }
+ if (await exists(gitDir)) {
await emitProgress({
status: 'preparing',
path: sourcePath,
@@ -546,7 +618,7 @@ async function prepareCindySourceInternal(
target: resolvedTarget,
phase: 'preparingBranch',
});
- const baseCommit = await git(env, ['rev-parse', `${baseRef}^{commit}`], sourcePath, signal);
+ const upstreamCommit = await git(env, ['rev-parse', `${baseRef}^{commit}`], sourcePath, signal);
const hasPersonal = await git(
env,
['branch', '--list', CINDY_PERSONAL_BRANCH],
@@ -554,31 +626,66 @@ async function prepareCindySourceInternal(
signal,
);
if (!hasPersonal.trim()) {
- await git(env, ['branch', CINDY_PERSONAL_BRANCH, baseCommit], sourcePath, signal);
+ await git(env, ['branch', CINDY_PERSONAL_BRANCH, upstreamCommit], sourcePath, signal);
}
await emitProgress({
status: 'preparing',
path: sourcePath,
target: resolvedTarget,
phase: 'checkingOut',
- baseCommit,
});
await git(env, ['checkout', CINDY_PERSONAL_BRANCH], sourcePath, signal);
const commit = await git(env, ['rev-parse', 'HEAD'], sourcePath, signal);
- // No dependency install here: nobody works in this checkout, task worktrees
- // install their own, and packaging installs when it actually runs.
+ const revisions = await readSourceRevisions(env, sourcePath, commit, upstreamCommit, signal);
+ await emitProgress({
+ status: 'preparing',
+ path: sourcePath,
+ target: resolvedTarget,
+ commit,
+ branch: CINDY_PERSONAL_BRANCH,
+ ...revisions,
+ phase: 'installing',
+ });
+ const processEnvironment = await resolveMakeToolEnvironment(
+ env,
+ ['node', 'pnpm', 'python'],
+ signal,
+ );
+ await runSourcePnpm(
+ processEnvironment,
+ ['install', '--frozen-lockfile', '--prefer-offline', '--prod=false'],
+ sourcePath,
+ signal,
+ );
+ signal.throwIfAborted();
const result: SourcePreparationResult = {
status: 'ready',
path: sourcePath,
target: resolvedTarget,
commit,
branch: CINDY_PERSONAL_BRANCH,
- baseCommit,
+ ...revisions,
};
await emitProgress(result);
return result;
} catch (error) {
const code = signal.aborted ? 'cancelled' : gitErrorCode(error);
+ const diagnostic = error as {
+ operation?: string;
+ exitCode?: number | null;
+ exitSignal?: string | null;
+ spawnCode?: string;
+ stderr?: string;
+ } | null;
+ if (code === 'gitFailed')
+ log.warn('cindy-make source Git operation failed', {
+ code,
+ operation: diagnostic?.operation,
+ exitCode: diagnostic?.exitCode,
+ exitSignal: diagnostic?.exitSignal,
+ spawnCode: diagnostic?.spawnCode,
+ stderr: diagnostic?.stderr,
+ });
const result: SourcePreparationResult = {
status: code === 'cancelled' ? 'cancelled' : 'failed',
path: sourcePath,
diff --git a/apps/desktop/src/main/cindy-make/sourceRevisions.ts b/apps/desktop/src/main/cindy-make/sourceRevisions.ts
new file mode 100644
index 0000000000..3108301152
--- /dev/null
+++ b/apps/desktop/src/main/cindy-make/sourceRevisions.ts
@@ -0,0 +1,69 @@
+import type { MakeSourceStatus } from '../../shared/cindyMakeDoctor.js';
+import type { MakeToolchainEnvironment } from './toolchainEnvironment.js';
+import { runSourceGit } from './sourceGit.js';
+
+export type SourceRevisions = Pick<
+ MakeSourceStatus,
+ 'baseCommit' | 'currentBranch' | 'mainCommit' | 'mainRemoteCommit' | 'mainBehind' | 'mainAhead'
+>;
+
+export function isSourceBranchName(value: unknown): value is string {
+ return (
+ typeof value === 'string' &&
+ value.length > 0 &&
+ value.length <= 255 &&
+ !/[\s\x00-\x1f\x7f]/.test(value)
+ );
+}
+
+export async function readSourceRevisions(
+ env: MakeToolchainEnvironment,
+ sourcePath: string,
+ personalCommit: string,
+ upstreamCommit: string | undefined,
+ signal: AbortSignal,
+): Promise<SourceRevisions> {
+ const query = async (args: string[]) => {
+ signal.throwIfAborted();
+ try {
+ const output = await runSourceGit(env.processEnvironment(), args, sourcePath, signal);
+ signal.throwIfAborted();
+ return output.trim();
+ } catch {
+ signal.throwIfAborted();
+ return undefined;
+ }
+ };
+ const readCommit = async (args: string[]) => {
+ const output = await query(args);
+ return output && /^[0-9a-f]{7,64}$/i.test(output) ? output : undefined;
+ };
+ const baseCommit = upstreamCommit
+ ? await readCommit(['merge-base', personalCommit, upstreamCommit])
+ : undefined;
+ const mainCommit = await readCommit(['rev-parse', '--verify', 'refs/heads/main^{commit}']);
+ const mainRemoteCommit = await readCommit([
+ 'rev-parse',
+ '--verify',
+ 'refs/remotes/origin/main^{commit}',
+ ]);
+ const branch = await query(['rev-parse', '--abbrev-ref', 'HEAD']);
+ const currentBranch = branch === 'HEAD' ? null : isSourceBranchName(branch) ? branch : undefined;
+ const revisions: SourceRevisions = { baseCommit, currentBranch, mainCommit, mainRemoteCommit };
+ if (mainCommit && mainRemoteCommit) {
+ const counts = await query([
+ 'rev-list',
+ '--left-right',
+ '--count',
+ `${mainCommit}...${mainRemoteCommit}`,
+ ]);
+ if (counts && /^\d+\s+\d+$/.test(counts)) {
+ const [ahead, behind] = counts.split(/\s+/).map(Number);
+ if (Number.isSafeInteger(ahead) && Number.isSafeInteger(behind)) {
+ revisions.mainAhead = ahead;
+ revisions.mainBehind = behind;
+ }
+ }
+ }
+ return revisions;
+}
diff --git a/apps/desktop/src/main/cindy-make/stateBroadcast.ts b/apps/desktop/src/main/cindy-make/stateBroadcast.ts
new file mode 100644
index 0000000000..7e1c850a32
--- /dev/null
+++ b/apps/desktop/src/main/cindy-make/stateBroadcast.ts
@@ -0,0 +1,16 @@
+import { BrowserWindow } from 'electron';
+
+import { MAKER_PUSH } from '../maker-ipc/channels.js';
+import type { CindyMakeGlobalState } from '../../shared/cindyMakeDoctor.js';
+
+/** Push the Main-owned Cindy Make snapshot to every trusted renderer window. */
+export function broadcastCindyMakeState(state: CindyMakeGlobalState): void {
+ for (const window of BrowserWindow.getAllWindows()) {
+ if (window.isDestroyed()) continue;
+ try {
+ window.webContents.send(MAKER_PUSH.CINDY_MAKE_STATE_CHANGED, state);
+ } catch {
+ // A closing renderer must not affect the operation running in Main.
+ }
+ }
+}
diff --git a/apps/desktop/src/main/cindy-make/taskWorkspace.ts b/apps/desktop/src/main/cindy-make/taskWorkspace.ts
index e50c117efd..f7e8ffdd3d 100644
--- a/apps/desktop/src/main/cindy-make/taskWorkspace.ts
+++ b/apps/desktop/src/main/cindy-make/taskWorkspace.ts
@@ -103,7 +103,13 @@ export async function prepareCindyMakeWorkspace(
}
}
onPhase('installing');
- await pnpm(env, ['install', '--prefer-offline'], worktreePath, signal);
+ await pnpm(
+ env,
+ ['install', '--frozen-lockfile', '--prefer-offline', '--prod=false'],
+ worktreePath,
+ signal,
+ );
+ signal.throwIfAborted();
return { path: worktreePath, branch, baseCommit: baseCommit.trim() };
}
diff --git a/apps/desktop/src/main/cindy-make/toolchainEnvironment.ts b/apps/desktop/src/main/cindy-make/toolchainEnvironment.ts
index b71b5de97b..de7b6b495a 100644
--- a/apps/desktop/src/main/cindy-make/toolchainEnvironment.ts
+++ b/apps/desktop/src/main/cindy-make/toolchainEnvironment.ts
@@ -1,5 +1,11 @@
import type { MakeToolId } from '../../shared/cindyMakeDoctor.js';
-import { checkMakeToolVersion, type MakeDoctorEnvironment } from './doctor.js';
+import path from 'node:path';
+import {
+ checkMakeToolVersion,
+ makePythonProbeCandidates,
+ untilAborted,
+ type MakeDoctorEnvironment,
+} from './doctor.js';
import {
createMakeDoctorEnvironment,
makeToolProcessEnvironment,
@@ -22,6 +28,33 @@ export interface MakeToolchainEnvironment extends MakeDoctorEnvironment {
processEnvironment: () => NodeJS.ProcessEnv;
}
+export async function resolveMakeToolEnvironment(
+ env: MakeToolchainEnvironment,
+ tools: readonly MakeToolId[],
+ signal: AbortSignal,
+): Promise<NodeJS.ProcessEnv> {
+ for (const tool of tools) {
+ signal.throwIfAborted();
+ const candidates =
+ tool === 'python' ? makePythonProbeCandidates(env.platform) : [makeToolProbe[tool]];
+ let ready = false;
+ for (const [command, args] of candidates) {
+ signal.throwIfAborted();
+ const probe = await untilAborted(env.probe(command, args, signal), signal);
+ if (checkMakeToolVersion(tool, probe, env.platform).status === 'passed') {
+ ready = true;
+ break;
+ }
+ }
+ if (!ready) {
+ const code = tool === 'git' ? 'gitUnavailable' : 'environmentNotReady';
+ throw Object.assign(new Error(code), { code });
+ }
+ }
+ signal.throwIfAborted();
+ return env.processEnvironment();
+}
+
/** Prefer working system tools, then reuse an already installed managed tool. This is read-only. */
export function selectMakeToolchainEnvironment(
factory: (paths: MakeToolPaths) => MakeDoctorEnvironment,
@@ -60,6 +93,23 @@ export function selectMakeToolchainEnvironment(
// `git lfs version` may resolve through Git's exec-path, and py is a launcher.
// Do not mistake their executable paths for standalone LFS/Python interpreters.
if (result.path && id !== 'gitLfs' && command !== 'py') selected[id] = result.path;
+ if (id === 'python' && command === 'py' && !selected.python) {
+ const interpreter = await factory(selected).probe(
+ 'py',
+ ['-3', '-c', 'import sys; print(sys.executable)'],
+ signal,
+ );
+ const executable = interpreter.stdout.trim();
+ const paths = base.platform === 'win32' ? path.win32 : path.posix;
+ if (
+ interpreter.status === 'ok' &&
+ paths.isAbsolute(executable) &&
+ !/[\r\n]/.test(executable)
+ ) {
+ selected.python = executable;
+ return { ...result, path: executable, source: 'system' };
+ }
+ }
return { ...result, source: managed.has(id) ? 'managed' : 'system' };
}
const cached = installed[id];
diff --git a/apps/desktop/src/main/cindy-make/upstreamInclusion.ts b/apps/desktop/src/main/cindy-make/upstreamInclusion.ts
new file mode 100644
index 0000000000..32091e3e0e
--- /dev/null
+++ b/apps/desktop/src/main/cindy-make/upstreamInclusion.ts
@@ -0,0 +1,138 @@
+import type {
+ MakeRuntimeVersion,
+ MakeUpstreamInclusion,
+ MakeUpstreamItem,
+} from '../../shared/cindyMakeDoctor';
+import { untilAborted } from './doctor';
+
+const REPOSITORY = 'makecindy/cindy';
+const MAX_ITEMS = 5;
+const MAX_CANDIDATES = 20;
+
+export interface UpstreamRuntimeDeps {
+ runtime?: MakeRuntimeVersion;
+ containsCommit?: (commit: string, signal: AbortSignal) => Promise<MakeUpstreamInclusion>;
+ isCurrent?: () => Promise<boolean>;
+}
+
+export async function filterUpstreamCandidates(
+ candidates: MakeUpstreamItem[],
+ read: (url: string) => Promise<Record<string, unknown>>,
+ signal: AbortSignal,
+ deps: UpstreamRuntimeDeps,
+) {
+ const runtime = deps.runtime ? { ...deps.runtime } : undefined;
+ const inspected: MakeUpstreamItem[] = [];
+ const comparisons = new Map<string, Promise<MakeUpstreamInclusion>>();
+ const current = async () => {
+ if (!deps.isCurrent) return true;
+ try {
+ return await untilAborted(deps.isCurrent(), signal);
+ } catch {
+ return false;
+ }
+ };
+ const contains = async (commit: string): Promise<MakeUpstreamInclusion> => {
+ if (runtime?.confidence !== 'exact' || !validCommit(runtime.commit) || !(await current()))
+ return 'unknown';
+ if (commit === runtime.commit) return 'included';
+ try {
+ const local = deps.containsCommit
+ ? await untilAborted(deps.containsCommit(commit, signal), signal)
+ : 'unknown';
+ if (local !== 'unknown') return local;
+ const comparison = await read(
+ `https://api.github.com/repos/${REPOSITORY}/compare/${commit}...${runtime.commit}`,
+ );
+ const base = record(comparison.base_commit)?.sha;
+ const common = record(comparison.merge_base_commit)?.sha;
+ if (base !== commit) return 'unknown';
+ if (
+ (comparison.status === 'ahead' || comparison.status === 'identical') &&
+ common === commit &&
+ comparison.behind_by === 0 &&
+ Array.isArray(comparison.commits) &&
+ comparison.total_commits === comparison.commits.length &&
+ !comparison.commits.some((entry) => {
+ const message = record(record(entry)?.commit)?.message;
+ return (
+ typeof message !== 'string' || (/revert/i.test(message) && message.includes(commit))
+ );
+ })
+ )
+ return 'included';
+ if (
+ comparison.status === 'behind' &&
+ common === runtime.commit &&
+ comparison.ahead_by === 0 &&
+ typeof comparison.behind_by === 'number' &&
+ comparison.behind_by > 0
+ )
+ return 'notIncluded';
+ return 'unknown';
+ } catch {
+ return 'unknown';
+ }
+ };
+ const inspect = async (item: MakeUpstreamItem): Promise<MakeUpstreamItem | null> => {
+ let detail: Record<string, unknown>;
+ try {
+ detail = await read(`https://api.github.com/repos/${REPOSITORY}/pulls/${item.number}`);
+ if (
+ detail.number !== item.number ||
+ detail.html_url !== item.htmlUrl ||
+ record(record(detail.base)?.repo)?.full_name !== REPOSITORY ||
+ typeof detail.merged !== 'boolean' ||
+ !['open', 'closed'].includes(String(detail.state)) ||
+ (detail.merged && detail.state !== 'closed')
+ )
+ throw new Error('Invalid pull request');
+ } catch {
+ return { ...item, inclusion: 'unknown' };
+ }
+ if (!detail.merged && detail.state === 'closed') return null;
+ const commit = detail.merged ? detail.merge_commit_sha : record(detail.head)?.sha;
+ let inclusion: MakeUpstreamInclusion = 'unknown';
+ if (validCommit(commit)) {
+ if (!comparisons.has(commit)) comparisons.set(commit, contains(commit));
+ inclusion = await comparisons.get(commit)!;
+ }
+ return {
+ ...item,
+ state: detail.merged ? 'merged' : 'open',
+ draft: detail.draft === true,
+ inclusion,
+ };
+ };
+ let inspectedCount = 0;
+ for (let offset = 0; offset < Math.min(candidates.length, MAX_CANDIDATES); offset += 2) {
+ signal.throwIfAborted();
+ const batch = candidates.slice(offset, Math.min(offset + 2, MAX_CANDIDATES));
+ inspectedCount += batch.length;
+ const results = await Promise.all(batch.map(inspect));
+ inspected.push(...results.filter((item): item is MakeUpstreamItem => item !== null));
+ if (inspected.filter((item) => item.inclusion !== 'included').length >= MAX_ITEMS) break;
+ }
+ if (!(await current())) {
+ if (runtime) runtime.confidence = 'unknown';
+ for (const item of inspected) item.inclusion = 'unknown';
+ }
+ signal.throwIfAborted();
+ const available = inspected.filter((item) => item.inclusion !== 'included');
+ return {
+ items: available.slice(0, MAX_ITEMS),
+ ...(runtime ? { runtime } : {}),
+ excludedIncluded: inspected.filter((item) => item.inclusion === 'included').length,
+ hasMore: candidates.length > inspectedCount || available.length > MAX_ITEMS,
+ };
+}
+
+function record(value: unknown): Record<string, unknown> | undefined {
+ return value && typeof value === 'object' && !Array.isArray(value)
+ ? (value as Record<string, unknown>)
+ : undefined;
+}
+
+function validCommit(value: unknown): value is string {
+ return typeof value === 'string' && /^[a-f0-9]{40}$/.test(value);
+}
diff --git a/apps/desktop/src/main/cindy-make/upstreamQuery.ts b/apps/desktop/src/main/cindy-make/upstreamQuery.ts
index 5ece6b022c..bd4058a9d3 100644
--- a/apps/desktop/src/main/cindy-make/upstreamQuery.ts
+++ b/apps/desktop/src/main/cindy-make/upstreamQuery.ts
@@ -1,8 +1,9 @@
import type { MakeUpstreamItem, MakeUpstreamQuery } from '../../shared/cindyMakeDoctor.js';
import { untilAborted } from './doctor.js';
+import { filterUpstreamCandidates, type UpstreamRuntimeDeps } from './upstreamInclusion.js';
const REPOSITORY = 'makecindy/cindy';
-const MAX_ITEMS = 5;
+const SEARCH_PAGE_SIZE = 10;
const TIMEOUT_MS = 25_000;
const FILLER = new Set(
(
@@ -11,7 +12,7 @@ const FILLER = new Set(
).split(' '),
);
-export interface UpstreamQueryDeps {
+export interface UpstreamQueryDeps extends UpstreamRuntimeDeps {
fetch: (url: string, init?: RequestInit) => Promise<Response>;
}
@@ -71,25 +72,33 @@ export async function searchCindyUpstream(
// Separate literal searches work with REST search grammar without imposing an AND
// across every word of a natural-language request. Rank repeated hits first.
const pages = await Promise.all(
- terms.map(async (term) => {
- const url = new URL('https://api.github.com/search/issues');
- url.searchParams.set('q', `repo:${REPOSITORY} is:open in:title,body "${term}"`);
- url.searchParams.set('per_page', String(MAX_ITEMS));
- const body = await read(url.toString());
- if (
- !Array.isArray(body.items) ||
- body.incomplete_results !== false ||
- typeof body.total_count !== 'number' ||
- body.total_count < 0 ||
- (body.total_count > 0 && body.items.length === 0)
- )
- throw new QueryFailure('invalidResponse');
- return body.items.slice(0, MAX_ITEMS).map(parseItem);
- }),
+ terms.flatMap((term) =>
+ ['is:open', 'is:merged'].map(async (scope) => {
+ const url = new URL('https://api.github.com/search/issues');
+ url.searchParams.set('q', `repo:${REPOSITORY} is:pr ${scope} in:title,body "${term}"`);
+ url.searchParams.set('per_page', String(SEARCH_PAGE_SIZE));
+ url.searchParams.set('sort', 'updated');
+ url.searchParams.set('order', 'desc');
+ const body = await read(url.toString());
+ if (
+ !Array.isArray(body.items) ||
+ body.incomplete_results !== false ||
+ typeof body.total_count !== 'number' ||
+ !Number.isSafeInteger(body.total_count) ||
+ (body.total_count as number) < body.items.length ||
+ (body.total_count > 0 && body.items.length === 0)
+ )
+ throw new QueryFailure('invalidResponse');
+ return {
+ items: body.items.slice(0, SEARCH_PAGE_SIZE).map(parseItem),
+ hasMore: (body.total_count as number) > Math.min(body.items.length, SEARCH_PAGE_SIZE),
+ };
+ }),
+ ),
);
const hits = new Map<number, { item: MakeUpstreamItem; count: number; rank: number }>();
for (const page of pages)
- page.forEach((item, rank) => {
+ page.items.forEach((item, rank) => {
const previous = hits.get(item.number);
hits.set(item.number, {
item,
@@ -97,12 +106,17 @@ export async function searchCindyUpstream(
rank: Math.min(previous?.rank ?? rank, rank),
});
});
- const items = [...hits.values()]
+ const candidates = [...hits.values()]
.sort((a, b) => b.count - a.count || a.rank - b.rank)
- .slice(0, MAX_ITEMS)
.map((hit) => hit.item);
+ const filtered = await filterUpstreamCandidates(candidates, read, controller.signal, deps);
controller.signal.throwIfAborted();
- return { status: items.length ? 'found' : 'notFound', items, terms };
+ return {
+ ...filtered,
+ status: filtered.items.length ? 'found' : 'notFound',
+ terms,
+ hasMore: filtered.hasMore || pages.some((page) => page.hasMore),
+ };
} catch (error) {
return {
status: signal.aborted ? 'cancelled' : 'failed',
@@ -126,15 +140,17 @@ function parseItem(value: unknown): MakeUpstreamItem {
if (!value || typeof value !== 'object') throw new QueryFailure('invalidResponse');
const row = value as Record<string, unknown>;
const number = row.number;
- const kind = row.pull_request && typeof row.pull_request === 'object' ? 'pr' : 'issue';
- const htmlUrl = `https://github.com/${REPOSITORY}/${kind === 'pr' ? 'pull' : 'issues'}/${number}`;
+ const htmlUrl = `https://github.com/${REPOSITORY}/pull/${number}`;
if (
!Number.isSafeInteger(number) ||
(number as number) <= 0 ||
typeof row.title !== 'string' ||
!row.title.trim() ||
row.html_url !== htmlUrl ||
- row.state !== 'open'
+ !row.pull_request ||
+ typeof row.pull_request !== 'object' ||
+ Array.isArray(row.pull_request) ||
+ (row.state !== 'open' && row.state !== 'closed')
)
throw new QueryFailure('invalidResponse');
const author =
@@ -145,8 +161,8 @@ function parseItem(value: unknown): MakeUpstreamItem {
number: number as number,
title: row.title.slice(0, 300),
htmlUrl,
- kind,
- state: 'open',
+ kind: 'pr',
+ state: row.state === 'open' ? 'open' : 'unknown',
author: typeof author === 'string' ? author.slice(0, 80) : undefined,
updatedAt:
typeof row.updated_at === 'string' && Number.isFinite(Date.parse(row.updated_at))
diff --git a/apps/desktop/src/main/commands/builtins.ts b/apps/desktop/src/main/commands/builtins.ts
index c94a0fb9ea..0e3c717612 100644
--- a/apps/desktop/src/main/commands/builtins.ts
+++ b/apps/desktop/src/main/commands/builtins.ts
@@ -22,6 +22,7 @@ import { createMakeDoctorCommand } from '../cindy-make/doctorCommand.js';
import { createMakeToolchainEnvironment } from '../cindy-make/toolchainEnvironment.js';
import { prepareCindyMakeEnvironment } from '../cindy-make/prepare.js';
import { searchCindyUpstream } from '../cindy-make/upstreamQuery.js';
+import { resolveMakeRuntime } from '../cindy-make/runtimeVersion.js';
import { makeToolRoot } from '../cindy-make/toolInstaller.js';
import { makeSourceRoot, prepareCindySource } from '../cindy-make/sourcePreparation.js';
import type { MakeDoctorReport } from '../../shared/cindyMakeDoctor.js';
@@ -391,7 +392,11 @@ export function registerBuiltinDesktopCommands(
allowInstallTest: () => !app.isPackaged,
searchUpstream: async (request, signal) => {
const { outboundFetch } = await import('../maker-host/outbound-fetch.js');
- return searchCindyUpstream(request, signal, { fetch: outboundFetch });
+ const runtime = await resolveMakeRuntime(
+ { packaged: app.isPackaged, version: app.getVersion() },
+ signal,
+ );
+ return searchCindyUpstream(request, signal, { fetch: outboundFetch, ...runtime });
},
prepare: (runId, env, signal, publish) =>
prepareCindyMakeEnvironment(
@@ -428,16 +433,19 @@ export function registerBuiltinDesktopCommands(
checks: [],
source: {
status:
- options?.clearOnly && progress.status === 'ready'
- ? 'missing'
- : progress.status,
+ options?.clearOnly && progress.status === 'ready' ? 'missing' : progress.status,
path: progress.path,
channel: progress.target.channel,
version: progress.target.version,
ref: progress.target.ref,
commit: progress.commit,
branch: progress.branch,
+ currentBranch: progress.currentBranch,
baseCommit: progress.baseCommit,
+ mainCommit: progress.mainCommit,
+ mainRemoteCommit: progress.mainRemoteCommit,
+ mainBehind: progress.mainBehind,
+ mainAhead: progress.mainAhead,
error: progress.error,
phase: progress.phase,
progress: progress.progress,
@@ -461,7 +469,12 @@ export function registerBuiltinDesktopCommands(
ref: result.target.ref,
commit: result.commit,
branch: result.branch,
+ currentBranch: result.currentBranch,
baseCommit: result.baseCommit,
+ mainCommit: result.mainCommit,
+ mainRemoteCommit: result.mainRemoteCommit,
+ mainBehind: result.mainBehind,
+ mainAhead: result.mainAhead,
error: result.error,
},
};
diff --git a/apps/desktop/src/main/maker-ipc/channels.ts b/apps/desktop/src/main/maker-ipc/channels.ts
index faeaa169f8..9c885696ed 100644
--- a/apps/desktop/src/main/maker-ipc/channels.ts
+++ b/apps/desktop/src/main/maker-ipc/channels.ts
@@ -909,6 +909,8 @@ export const MAKER_PUSH = {
* 分支处理; payload 还带 ctx (sessionId / workingDir / args) 让 renderer 知道在哪触发的。
*/
DESKTOP_COMMAND_TRIGGERED: 'maker:desktop-command-triggered',
+ /** Main-owned Cindy Make operation snapshots, broadcast to every trusted renderer. */
+ CINDY_MAKE_STATE_CHANGED: 'maker:cindy-make:state-changed',
/** multi-worker: worker 增删改 / focus 切换时 broadcast, renderer useWorkers hook 订阅刷新。 */
ORCA_WORKER_CHANGED: 'maker:orca:worker-changed',
/** Bot 间委派状态改变;payload 带父/子任务 id,广播自动附 owner generation。 */
diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.ts
index 80303470b5..d63044957e 100644
--- a/apps/desktop/src/preload/preload.ts
+++ b/apps/desktop/src/preload/preload.ts
@@ -3826,6 +3826,20 @@ contextBridge.exposeInMainWorld('electronAPI', {
getCindyMakeSourceStatus: (): Promise<import('../shared/cindyMakeDoctor').MakeSourceStatus> =>
ipcRenderer.invoke('app:get-cindy-make-source-status'),
+ getCindyMakeState: (): Promise<import('../shared/cindyMakeDoctor').CindyMakeGlobalState> =>
+ ipcRenderer.invoke('app:get-cindy-make-state'),
+
+ onCindyMakeState: (
+ listener: (state: import('../shared/cindyMakeDoctor').CindyMakeGlobalState) => void,
+ ): (() => void) => {
+ const wrapped = (
+ _event: Electron.IpcRendererEvent,
+ state: import('../shared/cindyMakeDoctor').CindyMakeGlobalState,
+ ) => listener(state);
+ ipcRenderer.on('maker:cindy-make:state-changed', wrapped);
+ return () => ipcRenderer.removeListener('maker:cindy-make:state-changed', wrapped);
+ },
+
openCindyMakeSourceDir: (): Promise<{ success: boolean }> =>
ipcRenderer.invoke('app:open-cindy-make-source-dir'),
diff --git a/apps/desktop/src/renderer/__tests__/buildRenderItemsKeyStability.test.ts b/apps/desktop/src/renderer/__tests__/buildRenderItemsKeyStability.test.ts
index b9e8187695..95c915263a 100644
--- a/apps/desktop/src/renderer/__tests__/buildRenderItemsKeyStability.test.ts
+++ b/apps/desktop/src/renderer/__tests__/buildRenderItemsKeyStability.test.ts
@@ -58,6 +58,20 @@ const mkAssistant = (id: string, content = 'ok'): ChatMessage => ({
content,
});
+it('keeps persistent Cindy Make progress visible in the message timeline', () => {
+ const built = buildRenderItems([
+ mkUser('u1', '之前的消息'),
+ {
+ ...mkAssistant('make-card'),
+ systemCardType: 'cindy-make',
+ systemCardData: { request: 'fix scrolling', report: { runId: 'run-1' } },
+ },
+ ]).items;
+ expect(
+ built.some((item) => item.type === 'message' && item.message.clientId === 'make-card'),
+ ).toBe(true);
+});
+
it('keeps modal-only Cindy Make cards out of the message timeline', () => {
const built = buildRenderItems([
mkUser('u1', '之前的消息'),
diff --git a/apps/desktop/src/renderer/__tests__/cindyMakeInlineEntry.test.ts b/apps/desktop/src/renderer/__tests__/cindyMakeInlineEntry.test.ts
new file mode 100644
index 0000000000..d7baa9d7ab
--- /dev/null
+++ b/apps/desktop/src/renderer/__tests__/cindyMakeInlineEntry.test.ts
@@ -0,0 +1,25 @@
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+import { describe, expect, it } from 'vitest';
+
+const composer = readFileSync(resolve(__dirname, '../components/new-chat/ChatInput.tsx'), 'utf8');
+
+describe('Cindy Make composer presentation', () => {
+ it('has no modal state or overlay for the preparation workflow', () => {
+ expect(composer).not.toContain('CindyMakeCommandDialog');
+ expect(composer).not.toContain('makeDialogSessionId');
+ });
+
+ it('navigates only a newly created container and retains the existing task route', () => {
+ const start = composer.indexOf("if (makeResult.kind === 'started')");
+ expect(start).toBeGreaterThan(-1);
+ const accepted = composer.slice(start, composer.indexOf('\n }', start));
+ expect(accepted).toContain('clearComposerDraft(sourceStorageKey)');
+ expect(accepted).toMatch(
+ /if\s*\(makeResult\.sessionId !== sourceSessionId\)\s*\{\s*navigate\('\/cc-agent\/' \+ makeResult\.sessionId\);\s*\}/,
+ );
+ expect(
+ composer.indexOf("if (!isMakeSourceCurrent() || makeResult.kind === 'stale') return;"),
+ ).toBeLessThan(start);
+ });
+});
diff --git a/apps/desktop/src/renderer/components/chat/CindyMakeCommandDialog.tsx b/apps/desktop/src/renderer/components/chat/CindyMakeCommandDialog.tsx
deleted file mode 100644
index c69e8b88af..0000000000
--- a/apps/desktop/src/renderer/components/chat/CindyMakeCommandDialog.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import { useCallback, useMemo, useRef, useSyncExternalStore } from 'react';
-import * as Dialog from '@radix-ui/react-dialog';
-import { X } from 'lucide-react';
-import { useTranslation } from 'react-i18next';
-import { CindyMakeDoctorCard } from './CindyMakeDoctorCard';
-import { makerChatStore } from '@/lib/makerChatStore';
-import { cancelMakeDoctor } from '@/lib/cindyMakeDoctor';
-import { toast } from '@/lib/toast';
-
-/** The slash command owns a transient modal card instead of a chat message. */
-export function CindyMakeCommandDialog({
- sessionId,
- open,
- onOpenChange,
-}: {
- sessionId: string | null;
- open: boolean;
- onOpenChange: (open: boolean) => void;
-}) {
- const { t } = useTranslation();
- const contentRef = useRef<HTMLDivElement>(null);
- const subscribe = useCallback(
- (listener: () => void) =>
- sessionId ? makerChatStore.subscribe(sessionId, listener) : () => {},
- [sessionId],
- );
- const getSnapshot = useCallback(
- () => (sessionId ? makerChatStore.getSnapshot(sessionId) : null),
- [sessionId],
- );
- const snapshot = useSyncExternalStore(subscribe, getSnapshot, () => null);
- const card = useMemo(
- () =>
- snapshot?.messages.find(
- (message) =>
- message.systemCardData?.modalOnly === true &&
- (message.systemCardType === 'cindy-make' ||
- message.systemCardType === 'cindy-make-doctor'),
- ),
- [snapshot],
- );
-
- const close = useCallback(() => {
- if (sessionId && card) {
- const report = card.systemCardData?.report as
- { runId?: string; mode?: 'check' | 'prepare'; status?: string } | undefined;
- if (report?.runId && report.status === 'running') {
- void cancelMakeDoctor(report.runId, report.mode).catch(() =>
- toast.error(t('cindyMakeDoctor.failed')),
- );
- }
- makerChatStore.removeMessageByClientId(sessionId, card.clientId);
- }
- onOpenChange(false);
- }, [card, onOpenChange, sessionId, t]);
-
- return (
- <Dialog.Root open={open} onOpenChange={(nextOpen) => (nextOpen ? onOpenChange(true) : close())}>
- <Dialog.Portal>
- <Dialog.Overlay
- data-testid="cindy-make-dialog-overlay"
- className="fixed inset-0 z-[10000] bg-[var(--overlay-modal)]"
- />
- <Dialog.Content
- ref={contentRef}
- tabIndex={-1}
- className="fixed left-1/2 top-1/2 z-[10001] max-h-[min(88vh,860px)] w-[min(720px,calc(100vw-32px))] -translate-x-1/2 -translate-y-1/2 overflow-y-auto overscroll-contain rounded-xl border border-[var(--border-default)] bg-[var(--surface-elevated)] shadow-xl outline-none"
- onOpenAutoFocus={(event) => {
- event.preventDefault();
- contentRef.current?.focus();
- }}
- onPointerDownOutside={(event) => event.preventDefault()}
- onInteractOutside={(event) => event.preventDefault()}
- >
- <div className="flex items-center justify-between border-b border-[var(--border-default)] px-4 py-3">
- <Dialog.Title className="text-16 font-medium text-[var(--text-primary)]">
- {t('cindyMake.title')}
- </Dialog.Title>
- <Dialog.Close asChild>
- <button
- type="button"
- className="rounded-lg p-1.5 text-[var(--text-secondary)] hover:bg-[var(--surface-hover)] hover:text-[var(--text-primary)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)]"
- aria-label={t('common.dismiss')}
- >
- <X size={16} aria-hidden />
- </button>
- </Dialog.Close>
- </div>
- <Dialog.Description className="sr-only">{t('cindyMake.description')}</Dialog.Description>
- <div className="p-4">
- {card ? (
- <CindyMakeDoctorCard
- data={card.systemCardData}
- sessionId={sessionId ?? undefined}
- onDismiss={close}
- />
- ) : (
- <div className="py-8 text-center text-13 text-[var(--text-secondary)]">
- {t('cindyMakeDoctor.running')}
- </div>
- )}
- </div>
- </Dialog.Content>
- </Dialog.Portal>
- </Dialog.Root>
- );
-}
diff --git a/apps/desktop/src/renderer/components/chat/CindyMakeDoctorCard.tsx b/apps/desktop/src/renderer/components/chat/CindyMakeDoctorCard.tsx
index 706f9c6b79..47b6a71a20 100644
--- a/apps/desktop/src/renderer/components/chat/CindyMakeDoctorCard.tsx
+++ b/apps/desktop/src/renderer/components/chat/CindyMakeDoctorCard.tsx
@@ -22,6 +22,7 @@ import { toast } from '@/lib/toast';
import {
isMakeEnvironmentReady,
type MakeDoctorReport,
+ type MakeRuntimeVersion,
type MakeUpstreamDecision,
type MakeUpstreamItem,
} from '../../../shared/cindyMakeDoctor';
@@ -298,7 +299,7 @@ export function MakeDoctorReportCard({
: 'text-[var(--text-secondary)]';
return (
<section
- className="w-full rounded-[12px] border border-[var(--border-default)] bg-[var(--surface-elevated)] text-14 text-[var(--text-primary)]"
+ className="min-w-0 w-full rounded-[12px] border border-[var(--border-default)] bg-[var(--surface-elevated)] text-14 text-[var(--text-primary)]"
aria-label={t(title)}
>
<div className="flex items-center gap-2 px-4 py-3">
@@ -452,45 +453,38 @@ export function MakeDoctorReportCard({
</p>
{source && (
<>
- {(source.phase || source.ref) && (
+ {source.status !== 'preparing' && (
<p className="text-[var(--text-secondary)]">
- {source.phase ? t(`cindyMake.source.phase.${source.phase}`) : null}
- {source.phase && source.ref ? ' · ' : ''}
- {source.ref ?? null}
+ {t(`cindyMake.source.${source.status}`)}
</p>
)}
- {source.progress && (
+ {source.status === 'preparing' && source.phase && !source.progress && (
+ <p className="text-[var(--text-secondary)]">
+ {t(`cindyMake.source.phase.${source.phase}`)}
+ </p>
+ )}
+ {source.status === 'preparing' && source.progress && (
<div
- className="flex items-center gap-2 text-12 text-[var(--text-secondary)]"
+ className="space-y-1 text-12 text-[var(--text-secondary)]"
aria-live="polite"
>
- <Spinner size={14} />
- <span>{t(`cindyMake.source.gitProgress.${source.progress.stage}`)}</span>
+ <div className="flex items-center gap-2">
+ <Spinner size={14} />
+ <span>{t(`cindyMake.source.gitProgress.${source.progress.stage}`)}</span>
+ <span className="text-[var(--text-tertiary)]">
+ ({source.progress.percent}%)
+ </span>
+ </div>
+ {source.progress.message && (
+ <p
+ className="truncate pl-5 font-mono text-11 text-[var(--text-tertiary)]"
+ title={source.progress.message}
+ >
+ {source.progress.message}
+ </p>
+ )}
</div>
)}
- {source.path && (
- <p className="break-all font-mono text-12 text-[var(--text-secondary)]">
- {source.path}
- </p>
- )}
- {source.branch ? (
- <p className="text-12 text-[var(--text-secondary)]">
- {t('cindyMake.source.personalBranch', { branch: source.branch })}
- {source.commit ? ` · ${source.commit.slice(0, 12)}` : ''}
- {source.baseCommit
- ? ` · ${t('cindyMake.source.baseCommit', {
- ref: source.ref ?? '',
- commit: source.baseCommit.slice(0, 12),
- })}`
- : ''}
- </p>
- ) : (
- source.commit && (
- <p className="break-all font-mono text-12 text-[var(--text-secondary)]">
- {source.commit}
- </p>
- )
- )}
{source.error && (
<p className="text-[var(--status-danger)]">
{t(`cindyMake.source.errors.${source.error}`)}
@@ -517,36 +511,32 @@ export function MakeDoctorReportCard({
{preparing && upstream.status !== 'pending' && upstream.status !== 'needsRequest' && (
<div className="space-y-2 text-13">
{upstream.status === 'found' && (
- <p className="font-medium">
- {t('cindyMake.upstream.count', { count: upstream.items.length })}
- </p>
- )}
- {upstream.terms?.length ? (
- <p className="text-12 text-[var(--text-secondary)]">
- {t('cindyMake.upstream.terms', { terms: upstream.terms.join(', ') })}
- </p>
- ) : null}
- {upstream.status === 'found' && (
- <ul
- // 列表区是弹窗里唯一的滚动区:高度封顶为 5 条收起的行(每行 44px),
- // 展开详情或条目更多时在列表内部滚动,弹窗本身不长出滚动条。
- className="max-h-[228px] overflow-y-auto overscroll-contain divide-y divide-[var(--border-default)]"
- >
- {upstream.items.map((item) => (
- <MakeUpstreamResult
- key={`${report.runId}-${item.kind}-${item.number}`}
- item={item}
- />
- ))}
- </ul>
+ <MakeUpstreamResults
+ key={report.runId}
+ items={upstream.items}
+ terms={upstream.terms}
+ runtime={upstream.runtime}
+ />
)}
{upstream.status === 'failed' && (
<p>{t(`cindyMake.upstream.failure.${upstream.failure ?? 'network'}`)}</p>
)}
{upstream.status === 'notFound' && <p>{t('cindyMake.upstream.notFoundHint')}</p>}
- {upstream.status === 'found' && (
+ {upstream.runtime?.confidence === 'unknown' && (
<p className="text-[var(--text-secondary)]">
- {t('cindyMake.upstream.resultHint')}
+ {t('cindyMake.upstream.runtimeUnknown')}
+ </p>
+ )}
+ {!!upstream.excludedIncluded && (
+ <p className="text-[var(--text-secondary)]">
+ {t('cindyMake.upstream.excludedIncluded', {
+ count: upstream.excludedIncluded,
+ })}
+ </p>
+ )}
+ {upstream.hasMore && (
+ <p className="text-[var(--text-secondary)]">
+ {t('cindyMake.upstream.limitedHint')}
</p>
)}
</div>
@@ -634,7 +624,64 @@ export function MakeDoctorReportCard({
);
}
-/** Each result keeps its own disclosure state; titles remain visible for scanning. */
+function MakeUpstreamResults({
+ items,
+ terms,
+ runtime,
+}: {
+ items: MakeUpstreamItem[];
+ terms?: string[];
+ runtime?: MakeRuntimeVersion;
+}) {
+ const { t } = useTranslation();
+ const [expanded, setExpanded] = useState(false);
+ const detailsId = useId();
+ return (
+ <div className="space-y-2">
+ <div className="flex flex-wrap items-center justify-between gap-2">
+ <p>{t('cindyMake.upstream.count', { count: items.length })}</p>
+ <Button
+ variant="secondary"
+ aria-expanded={expanded}
+ aria-controls={detailsId}
+ onClick={() => setExpanded((value) => !value)}
+ >
+ {expanded ? (
+ <ChevronDown size={14} aria-hidden />
+ ) : (
+ <ChevronRight size={14} aria-hidden />
+ )}
+ {t(expanded ? 'cindyMake.upstream.collapse' : 'cindyMake.upstream.expand')}
+ </Button>
+ </div>
+ <Collapse open={expanded} id={detailsId} inert={!expanded}>
+ <div className="space-y-2">
+ {runtime && (
+ <p className="text-12 text-[var(--text-secondary)]">
+ {t('cindyMake.upstream.runtimeVersion', {
+ channel: t(`cindyMake.upstream.channel.${runtime.channel}`),
+ version: runtime.version,
+ commit: runtime.commit?.slice(0, 12) ?? t('cindyMake.upstream.unknownCommit'),
+ })}
+ </p>
+ )}
+ {terms?.length ? (
+ <p className="text-12 text-[var(--text-secondary)]">
+ {t('cindyMake.upstream.terms', { terms: terms.join(', ') })}
+ </p>
+ ) : null}
+ <ul className="divide-y divide-[var(--border-default)]">
+ {items.map((item) => (
+ <MakeUpstreamResult key={item.kind + '-' + item.number} item={item} />
+ ))}
+ </ul>
+ <p className="text-[var(--text-secondary)]">{t('cindyMake.upstream.resultHint')}</p>
+ </div>
+ </Collapse>
+ </div>
+ );
+}
+
function MakeUpstreamResult({ item }: { item: MakeUpstreamItem }) {
const { t } = useTranslation();
const [expanded, setExpanded] = useState(false);
@@ -655,6 +702,15 @@ function MakeUpstreamResult({ item }: { item: MakeUpstreamItem }) {
)}
<span className="min-w-0 break-words font-medium [overflow-wrap:anywhere]">
{t(`cindyMake.upstream.kind.${item.kind}`)} #{item.number} · {item.title}
+ {item.inclusion && (
+ <span className="mt-1 block text-12 font-normal text-[var(--text-secondary)]">
+ {t(
+ item.draft ? 'cindyMake.upstream.draft' : `cindyMake.upstream.state.${item.state}`,
+ )}
+ {' · '}
+ {t(`cindyMake.upstream.inclusion.${item.inclusion}`)}
+ </span>
+ )}
</span>
</button>
<Collapse open={expanded} id={detailId} inert={!expanded}>
diff --git a/apps/desktop/src/renderer/components/chat/__tests__/CindyMakeCommandDialog.test.tsx b/apps/desktop/src/renderer/components/chat/__tests__/CindyMakeCommandDialog.test.tsx
deleted file mode 100644
index 2c6cb7dbd7..0000000000
--- a/apps/desktop/src/renderer/components/chat/__tests__/CindyMakeCommandDialog.test.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-// @vitest-environment jsdom
-import { afterEach, describe, expect, it, vi } from 'vitest';
-import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';
-import { CindyMakeCommandDialog } from '../CindyMakeCommandDialog';
-
-vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string) => key }) }));
-vi.mock('@/lib/cindyMakeDoctor', () => ({ cancelMakeDoctor: vi.fn(async () => {}) }));
-vi.mock('@/lib/makerChatStore', () => ({
- makerChatStore: {
- subscribe: vi.fn(() => () => {}),
- getSnapshot: vi.fn(() => null),
- removeMessageByClientId: vi.fn(),
- },
-}));
-vi.mock('@/lib/toast', () => ({ toast: { error: vi.fn() } }));
-
-afterEach(() => {
- cleanup();
- vi.clearAllMocks();
-});
-
-describe('Cindy Make command dialog', () => {
- it('focuses the dialog instead of Close and ignores clicks on the backdrop', async () => {
- const onOpenChange = vi.fn();
- render(<CindyMakeCommandDialog sessionId={null} open onOpenChange={onOpenChange} />);
-
- const dialog = screen.getByRole('dialog');
- const closeButton = screen.getByRole('button', { name: 'common.dismiss' });
- await waitFor(() => expect(document.activeElement).toBe(dialog));
- expect(document.activeElement).not.toBe(closeButton);
-
- const overlay = screen.getByTestId('cindy-make-dialog-overlay');
- fireEvent.pointerDown(overlay, { button: 0, pointerType: 'mouse' });
- fireEvent.click(overlay);
- expect(onOpenChange).not.toHaveBeenCalled();
-
- fireEvent.click(closeButton);
- expect(onOpenChange).toHaveBeenCalledWith(false);
- });
-});
diff --git a/apps/desktop/src/renderer/components/chat/__tests__/CindyMakeDoctorCard.test.tsx b/apps/desktop/src/renderer/components/chat/__tests__/CindyMakeDoctorCard.test.tsx
index 3ea06a7416..d79ed62d20 100644
--- a/apps/desktop/src/renderer/components/chat/__tests__/CindyMakeDoctorCard.test.tsx
+++ b/apps/desktop/src/renderer/components/chat/__tests__/CindyMakeDoctorCard.test.tsx
@@ -318,7 +318,7 @@ describe('Make upstream step', () => {
],
},
};
- it('lists all titles and choices immediately, with independent, initially collapsed details', async () => {
+ it('shows choices immediately and reveals results only on request, without nested scrolling', async () => {
const choose = vi.fn();
const openExternal = vi.fn(async () => ({ success: true }));
vi.stubGlobal('electronAPI', { openExternal });
@@ -330,6 +330,15 @@ describe('Make upstream step', () => {
onChoose={choose}
/>,
);
+ expect(screen.queryByRole('button', { name: /#12/ })).toBeNull();
+ expect(screen.queryByRole('list')).toBeNull();
+ expect(screen.getByText('cindyMake.upstream.count')).toBeTruthy();
+ expect(screen.getByRole('button', { name: 'cindyMake.upstream.personal' })).toBeTruthy();
+ expect(screen.getByRole('button', { name: 'cindyMake.upstream.wait' })).toBeTruthy();
+ const disclosure = screen.getByRole('button', { name: 'cindyMake.upstream.expand' });
+ expect(disclosure.getAttribute('aria-expanded')).toBe('false');
+ fireEvent.click(disclosure);
+ expect(screen.getByRole('list').className).not.toMatch(/overflow-y|max-h/);
const first = screen.getByRole('button', { name: /#12/ });
const second = screen.getByRole('button', { name: /#13/ });
expect(first.querySelector('b')).toBeNull();
@@ -368,6 +377,10 @@ describe('Make upstream step', () => {
expect(screen.queryByText('<script>literal</script>')).toBeNull();
expect(screen.getByText('Second result details')).toBeTruthy();
expect(second.getAttribute('aria-expanded')).toBe('true');
+ fireEvent.click(screen.getByRole('button', { name: 'cindyMake.upstream.collapse' }));
+ expect(screen.queryByRole('button', { name: /#12/ })).toBeNull();
+ expect(screen.queryByRole('link')).toBeNull();
+ expect(screen.getByRole('button', { name: 'cindyMake.upstream.personal' })).toBeTruthy();
});
it('renders upstream results directly under the upstream step', () => {
render(
@@ -383,6 +396,58 @@ describe('Make upstream step', () => {
expect(step.compareDocumentPosition(count) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
expect(count.compareDocumentPosition(step) & Node.DOCUMENT_POSITION_FOLLOWING).toBeFalsy();
});
+ it('shows PR state and runtime inclusion separately while leaving source details collapsed', () => {
+ render(
+ <MakeDoctorReportCard
+ report={{
+ ...found,
+ upstream: {
+ ...found.upstream!,
+ runtime: {
+ channel: 'dev',
+ version: '0.0.0',
+ commit: 'a'.repeat(40),
+ confidence: 'unknown',
+ },
+ items: [{ ...found.upstream!.items[0], state: 'merged', inclusion: 'unknown' }],
+ excludedIncluded: 2,
+ hasMore: true,
+ },
+ }}
+ onStop={vi.fn()}
+ onRecheck={vi.fn()}
+ onChoose={vi.fn()}
+ />,
+ );
+ expect(screen.getByText('cindyMake.upstream.runtimeUnknown')).toBeTruthy();
+ expect(screen.getByText('cindyMake.upstream.excludedIncluded')).toBeTruthy();
+ expect(screen.getByText('cindyMake.upstream.limitedHint')).toBeTruthy();
+ expect(screen.queryByText('cindyMake.upstream.runtimeVersion')).toBeNull();
+ fireEvent.click(screen.getByRole('button', { name: 'cindyMake.upstream.expand' }));
+ expect(screen.getByText('cindyMake.upstream.runtimeVersion')).toBeTruthy();
+ const row = screen.getByRole('button', { name: /#12/ });
+ expect(row.textContent).toContain('cindyMake.upstream.state.merged');
+ expect(row.textContent).toContain('cindyMake.upstream.inclusion.unknown');
+ expect(row.getAttribute('aria-expanded')).toBe('false');
+ expect(screen.getByRole('button', { name: 'cindyMake.upstream.personal' })).toBeTruthy();
+ });
+ it('explains an empty filtered result without claiming the search was exhaustive', () => {
+ render(
+ <MakeDoctorReportCard
+ report={{
+ ...found,
+ upstream: { status: 'notFound', items: [], excludedIncluded: 5, hasMore: true },
+ }}
+ onStop={vi.fn()}
+ onRecheck={vi.fn()}
+ onChoose={vi.fn()}
+ />,
+ );
+ expect(screen.getByText('cindyMake.upstream.excludedIncluded')).toBeTruthy();
+ expect(screen.getByText('cindyMake.upstream.limitedHint')).toBeTruthy();
+ expect(screen.queryByRole('button', { name: 'cindyMake.upstream.expand' })).toBeNull();
+ expect(screen.getByRole('button', { name: 'cindyMake.upstream.personal' })).toBeTruthy();
+ });
it('shows a completed source status after choosing a personal build', () => {
render(
<MakeDoctorReportCard
@@ -395,9 +460,44 @@ describe('Make upstream step', () => {
onRecheck={vi.fn()}
/>,
);
- expect(screen.getAllByText('cindyMake.source.ready')).toHaveLength(1);
+ expect(screen.getAllByText('cindyMake.source.ready')).toHaveLength(2);
expect(screen.getByRole('status').textContent).toContain('cindyMake.source.ready');
});
+ it('keeps source readiness visible without repository details or paths in the workflow card', () => {
+ render(
+ <MakeDoctorReportCard
+ report={{
+ ...found,
+ source: {
+ status: 'ready',
+ path: 'managed-source',
+ ref: 'main',
+ branch: 'cindy-personal',
+ currentBranch: 'feature/current',
+ commit: 'a'.repeat(40),
+ baseCommit: 'b'.repeat(40),
+ mainCommit: 'c'.repeat(40),
+ mainRemoteCommit: 'd'.repeat(40),
+ mainBehind: 5,
+ mainAhead: 2,
+ },
+ }}
+ onStop={vi.fn()}
+ onRecheck={vi.fn()}
+ />,
+ );
+ expect(screen.getByText('cindyMake.source.ready')).toBeTruthy();
+ expect(screen.queryByText('cindy-personal')).toBeNull();
+ expect(screen.queryByText('managed-source')).toBeNull();
+ for (const prefix of ['b', 'c']) {
+ expect(screen.queryByText(prefix.repeat(12))).toBeNull();
+ }
+ expect(screen.queryByText('feature/current')).toBeNull();
+ expect(screen.queryByText('main')).toBeNull();
+ expect(screen.queryByText('a'.repeat(12))).toBeNull();
+ expect(screen.queryByText('a'.repeat(40))).toBeNull();
+ expect(screen.queryByText('d'.repeat(12))).toBeNull();
+ });
it('uses a spinner instead of a transient progress bar while preparing source', () => {
render(
<MakeDoctorReportCard
@@ -426,6 +526,7 @@ describe('Make upstream step', () => {
expect(screen.getByRole('status').textContent).toContain('cindyMake.upstream.choice.personal');
expect(screen.queryByText('cindyMake.upstream.decisionHint.personal')).toBeNull();
expect(screen.queryByRole('button', { name: 'cindyMake.upstream.personal' })).toBeNull();
+ fireEvent.click(screen.getByRole('button', { name: 'cindyMake.upstream.expand' }));
fireEvent.click(screen.getByRole('button', { name: /#12/ }));
view.rerender(
<MakeDoctorReportCard
@@ -434,11 +535,46 @@ describe('Make upstream step', () => {
/>,
);
view.rerender(<MakeDoctorReportCard {...props} report={found} />);
+ expect(screen.queryByRole('button', { name: /#12/ })).toBeNull();
+ fireEvent.click(screen.getByRole('button', { name: 'cindyMake.upstream.expand' }));
expect(screen.getByRole('button', { name: /#12/ }).getAttribute('aria-expanded')).toBe('false');
fireEvent.click(screen.getByRole('button', { name: /#12/ }));
view.rerender(<MakeDoctorReportCard {...props} report={{ ...found, runId: 'next-run' }} />);
+ expect(screen.queryByRole('button', { name: /#12/ })).toBeNull();
+ fireEvent.click(screen.getByRole('button', { name: 'cindyMake.upstream.expand' }));
expect(screen.getByRole('button', { name: /#12/ }).getAttribute('aria-expanded')).toBe('false');
});
+ it('shows the live Git line compactly and clears stale progress once source is ready', () => {
+ const source: NonNullable<MakeDoctorReport['source']> = {
+ status: 'preparing',
+ path: 'managed-source',
+ phase: 'fetching',
+ progress: {
+ stage: 'receiving',
+ percent: 43,
+ message: 'Receiving objects: 43% (43/100), 1.00 MiB | 1.00 MiB/s',
+ },
+ };
+ const props = { onStop: vi.fn(), onRecheck: vi.fn() };
+ const view = render(
+ <MakeDoctorReportCard {...props} report={{ ...found, status: 'running', source }} />,
+ );
+ const progressLine = screen.getByText(source.progress!.message!);
+ expect(progressLine.className).toContain('truncate');
+ expect(progressLine.getAttribute('title')).toBe(source.progress!.message);
+ expect(screen.getByText('(43%)')).toBeTruthy();
+ expect(screen.queryByText('cindyMake.source.phase.fetching')).toBeNull();
+ view.rerender(
+ <MakeDoctorReportCard
+ {...props}
+ report={{ ...found, source: { ...source, status: 'ready' } }}
+ />,
+ );
+ expect(screen.getByText('cindyMake.source.ready')).toBeTruthy();
+ expect(screen.queryByText(source.progress!.message!)).toBeNull();
+ expect(screen.queryByText('cindyMake.source.gitProgress.receiving')).toBeNull();
+ expect(screen.queryByText('cindyMake.source.phase.fetching')).toBeNull();
+ });
});
const report: MakeDoctorReport = {
runId: 'run',
diff --git a/apps/desktop/src/renderer/components/cindy-make/CindyMakeCreateDialog.tsx b/apps/desktop/src/renderer/components/cindy-make/CindyMakeCreateDialog.tsx
new file mode 100644
index 0000000000..30b725defe
--- /dev/null
+++ b/apps/desktop/src/renderer/components/cindy-make/CindyMakeCreateDialog.tsx
@@ -0,0 +1,183 @@
+import { useEffect, useRef, useState } from 'react';
+import * as Dialog from '@radix-ui/react-dialog';
+import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
+
+import { Button } from '@/components/ui/button';
+import { FormField } from '@/components/ui/form-field';
+import { Textarea } from '@/components/ui/input';
+import {
+ getDataOwnerGeneration,
+ isDataOwnerGenerationCurrent,
+} from '@/contexts/dataOwnerGeneration';
+import { isSelectableVendor } from '@/lib/agentVendors';
+
+const MAX_REQUEST_LENGTH = 4000;
+
+export function CindyMakeCreateDialog({ onOpenChange }: { onOpenChange: (open: boolean) => void }) {
+ const { t } = useTranslation();
+ const navigate = useNavigate();
+ const [request, setRequest] = useState('');
+ const [starting, setStarting] = useState(false);
+ const [failed, setFailed] = useState(false);
+ const submitting = useRef(false);
+ const mounted = useRef(true);
+ const owner = useRef(getDataOwnerGeneration());
+ const sessionId = useRef<string | undefined>(undefined);
+ const returnFocusRef = useRef(
+ document.activeElement instanceof HTMLElement ? document.activeElement : null,
+ );
+ const valid = request.trim().length > 0 && request.length <= MAX_REQUEST_LENGTH;
+
+ useEffect(() => {
+ mounted.current = true;
+ return () => {
+ mounted.current = false;
+ };
+ }, []);
+
+ const submit = async () => {
+ const isCurrent = () => isDataOwnerGenerationCurrent(owner.current);
+ if (!valid || submitting.current) return;
+ if (!isCurrent()) {
+ onOpenChange(false);
+ return;
+ }
+ submitting.current = true;
+ setStarting(true);
+ setFailed(false);
+ try {
+ const [{ ensureMakeTask, startMakeDoctorInStream }, draftState] = await Promise.all([
+ import('@/lib/cindyMakeDoctorStream'),
+ import('@/state/newMakerDraft'),
+ ]);
+ if (!isCurrent()) return;
+ const draft = draftState.getDraft();
+ const vendor = isSelectableVendor(draft.vendor) ? draft.vendor : 'cc';
+ const prefs = draft.lastByVendor[vendor];
+ const createdId = await ensureMakeTask({
+ sessionId: sessionId.current,
+ title: t('settings.cindyMake.create.title'),
+ createOptions: {
+ workspaceKind: 'dialogue',
+ agentKind: vendor,
+ model: prefs.model,
+ effort: prefs.effort,
+ permissionMode: prefs.permissionMode,
+ providerId: prefs.providerId,
+ fastMode: draftState.getFastModeForModel(prefs.model),
+ planModeEnabled: prefs.planMode,
+ },
+ isCurrent,
+ });
+ if (!isCurrent()) return;
+ if (!createdId) throw new Error('Cindy Make task was not created');
+ sessionId.current = createdId;
+ const runId = startMakeDoctorInStream(createdId, { command: 'cindy-make', request });
+ if (!runId) throw new Error('Cindy Make workflow was not started');
+ if (mounted.current) {
+ onOpenChange(false);
+ navigate('/cc-agent/' + createdId);
+ }
+ } catch {
+ if (mounted.current && isCurrent()) setFailed(true);
+ } finally {
+ submitting.current = false;
+ if (mounted.current) {
+ setStarting(false);
+ if (!isCurrent()) onOpenChange(false);
+ }
+ }
+ };
+
+ return (
+ <Dialog.Root open onOpenChange={(open) => !submitting.current && onOpenChange(open)}>
+ <Dialog.Portal>
+ <Dialog.Overlay className="fixed inset-0 z-[10000] bg-[var(--overlay-modal)]" />
+ <Dialog.Content
+ className="fixed left-1/2 top-1/2 z-[10001] flex max-h-[85vh] w-[min(460px,calc(100vw-32px))] -translate-x-1/2 -translate-y-1/2 flex-col overflow-y-auto rounded-xl bg-[var(--confirm-bg)] p-4 shadow-[var(--confirm-shadow)] outline-none"
+ onCloseAutoFocus={(event) => {
+ event.preventDefault();
+ if (returnFocusRef.current?.isConnected) returnFocusRef.current.focus();
+ }}
+ onEscapeKeyDown={(event) => {
+ if (event.isComposing || event.keyCode === 229) event.preventDefault();
+ }}
+ >
+ <Dialog.Title className="text-16 font-semibold text-[var(--confirm-title)]">
+ {t('settings.cindyMake.create.title')}
+ </Dialog.Title>
+ <Dialog.Description className="mt-2 text-13 leading-relaxed text-[var(--confirm-desc)]">
+ {t('settings.cindyMake.create.description')}
+ </Dialog.Description>
+ <form
+ className="mt-4 flex flex-col gap-4"
+ onSubmit={(event) => {
+ event.preventDefault();
+ void submit();
+ }}
+ >
+ <FormField
+ label={t('settings.cindyMake.create.requestLabel')}
+ required
+ hint={t('settings.cindyMake.create.requestHint', { max: MAX_REQUEST_LENGTH })}
+ >
+ {(control) => (
+ <Textarea
+ {...control}
+ value={request}
+ onChange={(value) => {
+ setRequest(value);
+ setFailed(false);
+ }}
+ placeholder={t('settings.cindyMake.create.placeholder')}
+ rows={5}
+ maxLength={MAX_REQUEST_LENGTH}
+ disabled={starting}
+ className="min-h-[120px] resize-y"
+ onKeyDown={(event) => {
+ if (
+ event.key === 'Enter' &&
+ (event.metaKey || event.ctrlKey) &&
+ !event.nativeEvent.isComposing
+ ) {
+ event.preventDefault();
+ void submit();
+ }
+ }}
+ />
+ )}
+ </FormField>
+ {failed && (
+ <p role="alert" className="text-13 text-[var(--error-fg)]">
+ {t('settings.cindyMake.create.failed')}
+ </p>
+ )}
+ <div className="flex flex-wrap justify-end gap-2">
+ <Dialog.Close asChild>
+ <Button
+ type="button"
+ variant="secondary"
+ size="lg"
+ disabled={starting}
+ className="border-[var(--confirm-btn-secondary-border)] bg-transparent text-[var(--confirm-btn-secondary-text)] enabled:hover:bg-[var(--confirm-btn-secondary-hover)] enabled:active:bg-[var(--confirm-btn-secondary-hover)]"
+ >
+ {t('settings.cindyMake.create.cancel')}
+ </Button>
+ </Dialog.Close>
+ <Button
+ type="submit"
+ size="lg"
+ disabled={!valid}
+ loading={starting}
+ className="border-transparent bg-[var(--confirm-btn-primary-bg)] text-[var(--confirm-btn-primary-text)] enabled:hover:border-transparent enabled:active:border-transparent enabled:hover:bg-[var(--confirm-btn-primary-hover)] enabled:active:bg-[var(--confirm-btn-primary-hover)]"
+ >
+ {t('settings.cindyMake.create.continue')}
+ </Button>
+ </div>
+ </form>
+ </Dialog.Content>
+ </Dialog.Portal>
+ </Dialog.Root>
+ );
+}
diff --git a/apps/desktop/src/renderer/components/cindy-make/CindyMakeSourceDetails.tsx b/apps/desktop/src/renderer/components/cindy-make/CindyMakeSourceDetails.tsx
new file mode 100644
index 0000000000..0d2ff62643
--- /dev/null
+++ b/apps/desktop/src/renderer/components/cindy-make/CindyMakeSourceDetails.tsx
@@ -0,0 +1,41 @@
+import { useTranslation } from 'react-i18next';
+import type { MakeSourcePreparation } from '../../../shared/cindyMakeDoctor';
+
+export function CindyMakeSourceDetails({ source }: { source: MakeSourcePreparation }) {
+ const { t } = useTranslation();
+ const unknown = t('cindyMake.source.details.unknown');
+ return (
+ <div className="min-w-0 space-y-2 text-12 text-[var(--text-secondary)]">
+ <dl className="grid gap-3">
+ <div className="min-w-0">
+ <dt className="font-medium">{t('cindyMake.source.details.branch')}</dt>
+ <dd className="space-y-1">
+ <div className="break-all font-mono">{source.branch ?? unknown}</div>
+ <div className="text-[var(--text-tertiary)]">
+ {source.ref
+ ? t('cindyMake.source.details.baseRef', { ref: source.ref })
+ : t('cindyMake.source.details.baseCommit')}{' '}
+ <span className="break-all font-mono" title={source.baseCommit}>
+ {source.baseCommit?.slice(0, 12) ?? unknown}
+ </span>
+ </div>
+ </dd>
+ </div>
+ <div className="min-w-0">
+ <dt className="font-medium">{t('cindyMake.source.details.mainCommit')}</dt>
+ <dd className="break-all font-mono" title={source.mainCommit}>
+ {source.mainCommit?.slice(0, 12) ?? unknown}
+ </dd>
+ </div>
+ <div className="min-w-0">
+ <dt className="font-medium">{t('cindyMake.source.details.currentBranch')}</dt>
+ <dd className="break-all font-mono">
+ {source.currentBranch === null
+ ? t('cindyMake.source.details.detached')
+ : (source.currentBranch ?? unknown)}
+ </dd>
+ </div>
+ </dl>
+ </div>
+ );
+}
diff --git a/apps/desktop/src/renderer/components/cindy-make/__tests__/CindyMakeCreateDialog.test.tsx b/apps/desktop/src/renderer/components/cindy-make/__tests__/CindyMakeCreateDialog.test.tsx
new file mode 100644
index 0000000000..edcb7e1c8d
--- /dev/null
+++ b/apps/desktop/src/renderer/components/cindy-make/__tests__/CindyMakeCreateDialog.test.tsx
@@ -0,0 +1,240 @@
+// @vitest-environment jsdom
+import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { CindyMakeCreateDialog } from '../CindyMakeCreateDialog';
+import { setDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';
+
+const mocks = vi.hoisted(() => ({
+ ensureMakeTask: vi.fn<typeof import('@/lib/cindyMakeDoctorStream').ensureMakeTask>(),
+ startMakeDoctorInStream:
+ vi.fn<typeof import('@/lib/cindyMakeDoctorStream').startMakeDoctorInStream>(),
+ getDraft: vi.fn(),
+ getFastModeForModel: vi.fn(),
+ navigate: vi.fn(),
+}));
+
+vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string) => key }) }));
+vi.mock('react-router-dom', () => ({ useNavigate: () => mocks.navigate }));
+vi.mock('@/lib/cindyMakeDoctorStream', () => ({
+ ensureMakeTask: mocks.ensureMakeTask,
+ startMakeDoctorInStream: mocks.startMakeDoctorInStream,
+}));
+vi.mock('@/state/newMakerDraft', () => ({
+ getDraft: mocks.getDraft,
+ getFastModeForModel: mocks.getFastModeForModel,
+}));
+
+function deferred<T>() {
+ let resolve!: (value: T) => void;
+ const promise = new Promise<T>((done) => {
+ resolve = done;
+ });
+ return { promise, resolve };
+}
+
+function openDialog() {
+ const onOpenChange = vi.fn();
+ const view = render(<CindyMakeCreateDialog onOpenChange={onOpenChange} />);
+ const input = screen.getByRole('textbox') as HTMLTextAreaElement;
+ const submit = screen.getByRole('button', {
+ name: 'settings.cindyMake.create.continue',
+ }) as HTMLButtonElement;
+ return { ...view, onOpenChange, input, submit };
+}
+
+beforeEach(() => {
+ vi.resetAllMocks();
+ setDataOwnerGeneration('owner-a', 1);
+ mocks.ensureMakeTask.mockResolvedValue('make-task');
+ mocks.startMakeDoctorInStream.mockReturnValue('make-run');
+ mocks.getFastModeForModel.mockReturnValue(true);
+ const prefs = {
+ model: 'selected-model',
+ effort: 'high',
+ permissionMode: 'acceptEdits',
+ providerId: 'selected-provider',
+ planMode: true,
+ };
+ mocks.getDraft.mockReturnValue({
+ vendor: 'codex',
+ lastByVendor: { cc: prefs, codex: prefs, pi: prefs },
+ workingDir: '/existing-project',
+ remoteHostId: 'existing-ssh-host',
+ deviceLinkDeviceId: 'existing-device',
+ extraDirs: ['/existing-reference'],
+ collab: { enabled: true },
+ });
+});
+
+afterEach(() => {
+ cleanup();
+ setDataOwnerGeneration(null);
+});
+
+describe('Cindy Make creation from Settings', () => {
+ it('focuses the requirements and creates nothing on opening or cancelling', () => {
+ const view = openDialog();
+ expect(document.activeElement).toBe(view.input);
+ expect(view.submit.disabled).toBe(true);
+ expect(view.input.maxLength).toBe(4000);
+ fireEvent.click(screen.getByRole('button', { name: 'settings.cindyMake.create.cancel' }));
+ expect(view.onOpenChange).toHaveBeenCalledWith(false);
+ expect(mocks.ensureMakeTask).not.toHaveBeenCalled();
+ expect(mocks.startMakeDoctorInStream).not.toHaveBeenCalled();
+ expect(mocks.getDraft).not.toHaveBeenCalled();
+ });
+
+ it('allows Escape to dismiss before submitting', () => {
+ const view = openDialog();
+ fireEvent.keyDown(view.input, { key: 'Escape', isComposing: true });
+ expect(view.onOpenChange).not.toHaveBeenCalled();
+ fireEvent.keyDown(view.input, { key: 'Escape' });
+ expect(view.onOpenChange).toHaveBeenCalledWith(false);
+ expect(mocks.ensureMakeTask).not.toHaveBeenCalled();
+ });
+
+ it.each(['', ' ', 'x'.repeat(4001)])('rejects invalid requirements (%#)', async (request) => {
+ const view = openDialog();
+ fireEvent.change(view.input, { target: { value: request } });
+ expect(view.submit.disabled).toBe(true);
+ await act(async () => {
+ fireEvent.submit(view.input.closest('form')!);
+ fireEvent.keyDown(view.input, { key: 'Enter', ctrlKey: true });
+ });
+ expect(mocks.ensureMakeTask).not.toHaveBeenCalled();
+ expect(mocks.startMakeDoctorInStream).not.toHaveBeenCalled();
+ });
+
+ it.each(['cc', 'codex', 'pi'])(
+ 'uses the shared workflow and %s preferences without modifying the existing draft',
+ async (vendor) => {
+ const draft = { ...mocks.getDraft(), vendor };
+ mocks.getDraft.mockReturnValue(draft);
+ const originalDraft = JSON.stringify(draft);
+ const view = openDialog();
+ const request = 'Add a task filter.\nKeep the existing layout. ';
+ fireEvent.change(view.input, { target: { value: request } });
+ fireEvent.click(view.submit);
+
+ await waitFor(() => expect(mocks.navigate).toHaveBeenCalledWith('/cc-agent/make-task'));
+ expect(mocks.ensureMakeTask).toHaveBeenCalledExactlyOnceWith({
+ sessionId: undefined,
+ title: 'settings.cindyMake.create.title',
+ isCurrent: expect.any(Function),
+ createOptions: {
+ workspaceKind: 'dialogue',
+ agentKind: vendor,
+ model: 'selected-model',
+ effort: 'high',
+ permissionMode: 'acceptEdits',
+ providerId: 'selected-provider',
+ fastMode: true,
+ planModeEnabled: true,
+ },
+ });
+ expect(mocks.startMakeDoctorInStream).toHaveBeenCalledExactlyOnceWith('make-task', {
+ command: 'cindy-make',
+ request,
+ });
+ expect(view.onOpenChange).toHaveBeenCalledWith(false);
+ expect(JSON.stringify(draft)).toBe(originalDraft);
+ },
+ );
+
+ it('coalesces repeated submissions while creating the task', async () => {
+ const pending = deferred<string | null>();
+ mocks.ensureMakeTask.mockReturnValue(pending.promise);
+ const view = openDialog();
+ fireEvent.change(view.input, { target: { value: 'Add a filter' } });
+ fireEvent.click(view.submit);
+ fireEvent.submit(view.input.closest('form')!);
+ fireEvent.keyDown(view.input, { key: 'Enter', metaKey: true });
+ await waitFor(() => expect(mocks.ensureMakeTask).toHaveBeenCalledTimes(1));
+ expect(view.submit.disabled).toBe(true);
+ expect(view.input.disabled).toBe(true);
+ await act(async () => pending.resolve('make-task'));
+ expect(mocks.startMakeDoctorInStream).toHaveBeenCalledTimes(1);
+ expect(mocks.navigate).toHaveBeenCalledTimes(1);
+ });
+
+ it('keeps the requirements after a creation failure and permits retry', async () => {
+ mocks.ensureMakeTask.mockRejectedValueOnce(new Error('creation failed'));
+ const view = openDialog();
+ fireEvent.change(view.input, { target: { value: 'Add a filter' } });
+ fireEvent.click(view.submit);
+ await waitFor(() => expect(screen.getByRole('alert')).toBeTruthy());
+ expect(view.input.value).toBe('Add a filter');
+ expect(view.submit.disabled).toBe(false);
+ expect(mocks.startMakeDoctorInStream).not.toHaveBeenCalled();
+ expect(mocks.navigate).not.toHaveBeenCalled();
+ fireEvent.click(view.submit);
+ await waitFor(() => expect(mocks.navigate).toHaveBeenCalledTimes(1));
+ expect(mocks.ensureMakeTask).toHaveBeenCalledTimes(2);
+ });
+
+ it('reuses the created task if starting the workflow fails', async () => {
+ mocks.startMakeDoctorInStream.mockReturnValueOnce(null);
+ const view = openDialog();
+ fireEvent.change(view.input, { target: { value: 'Add a filter' } });
+ fireEvent.click(view.submit);
+ await waitFor(() => expect(screen.getByRole('alert')).toBeTruthy());
+ fireEvent.click(view.submit);
+ await waitFor(() => expect(mocks.navigate).toHaveBeenCalledTimes(1));
+ expect(mocks.ensureMakeTask.mock.calls[1][0].sessionId).toBe('make-task');
+ });
+
+ it('does not start or navigate under a different account after task creation', async () => {
+ const pending = deferred<string | null>();
+ mocks.ensureMakeTask.mockReturnValue(pending.promise);
+ const view = openDialog();
+ fireEvent.change(view.input, { target: { value: 'Add a filter' } });
+ fireEvent.click(view.submit);
+ await waitFor(() => expect(mocks.ensureMakeTask).toHaveBeenCalledTimes(1));
+ setDataOwnerGeneration('owner-b', 2);
+ expect(mocks.ensureMakeTask.mock.calls[0][0].isCurrent()).toBe(false);
+ await act(async () => pending.resolve('old-owner-task'));
+ expect(mocks.startMakeDoctorInStream).not.toHaveBeenCalled();
+ expect(mocks.navigate).not.toHaveBeenCalled();
+ expect(view.onOpenChange).toHaveBeenCalledWith(false);
+ });
+
+ it('dismisses a stale form rather than submitting the previous account’s request', async () => {
+ const view = openDialog();
+ fireEvent.change(view.input, { target: { value: 'Add a filter' } });
+ setDataOwnerGeneration('owner-b', 2);
+ await act(async () => fireEvent.click(view.submit));
+ expect(mocks.ensureMakeTask).not.toHaveBeenCalled();
+ expect(mocks.startMakeDoctorInStream).not.toHaveBeenCalled();
+ expect(view.onOpenChange).toHaveBeenCalledWith(false);
+ });
+
+ it('keeps accepted work independent of Settings unmount without late navigation', async () => {
+ const pending = deferred<string | null>();
+ mocks.ensureMakeTask.mockReturnValue(pending.promise);
+ const view = openDialog();
+ fireEvent.change(view.input, { target: { value: 'Add a filter' } });
+ fireEvent.click(view.submit);
+ await waitFor(() => expect(mocks.ensureMakeTask).toHaveBeenCalledTimes(1));
+ view.unmount();
+ expect(mocks.ensureMakeTask.mock.calls[0][0].isCurrent()).toBe(true);
+ await act(async () => pending.resolve('make-task'));
+ expect(mocks.startMakeDoctorInStream).toHaveBeenCalledExactlyOnceWith('make-task', {
+ command: 'cindy-make',
+ request: 'Add a filter',
+ });
+ expect(mocks.navigate).not.toHaveBeenCalled();
+ expect(view.onOpenChange).not.toHaveBeenCalled();
+ });
+
+ it('supports Ctrl+Enter but never submits while composing text', async () => {
+ const view = openDialog();
+ fireEvent.change(view.input, { target: { value: 'Add a filter' } });
+ await act(async () => {
+ fireEvent.keyDown(view.input, { key: 'Enter', ctrlKey: true, isComposing: true });
+ });
+ expect(mocks.ensureMakeTask).not.toHaveBeenCalled();
+ fireEvent.keyDown(view.input, { key: 'Enter', ctrlKey: true });
+ await waitFor(() => expect(mocks.navigate).toHaveBeenCalledTimes(1));
+ });
+});
diff --git a/apps/desktop/src/renderer/components/cindy-make/__tests__/CindyMakeSourceDetails.test.tsx b/apps/desktop/src/renderer/components/cindy-make/__tests__/CindyMakeSourceDetails.test.tsx
new file mode 100644
index 0000000000..b7fe0ca736
--- /dev/null
+++ b/apps/desktop/src/renderer/components/cindy-make/__tests__/CindyMakeSourceDetails.test.tsx
@@ -0,0 +1,105 @@
+// @vitest-environment jsdom
+import { cleanup, render, screen } from '@testing-library/react';
+import { afterEach, describe, expect, it } from 'vitest';
+import { createInstance } from 'i18next';
+import { I18nextProvider } from 'react-i18next';
+import { CindyMakeSourceDetails } from '../CindyMakeSourceDetails';
+import type { MakeSourcePreparation } from '../../../../shared/cindyMakeDoctor';
+import en from '@/i18n/locales/en/common.json';
+import zhCN from '@/i18n/locales/zh-CN/common.json';
+import zhTW from '@/i18n/locales/zh-TW/common.json';
+import ja from '@/i18n/locales/ja/common.json';
+import ko from '@/i18n/locales/ko/common.json';
+
+const source: MakeSourcePreparation = {
+ status: 'ready',
+ path: 'managed-source',
+ branch: 'cindy-personal',
+ currentBranch: 'feature/active',
+ ref: 'main',
+ commit: 'a'.repeat(40),
+ baseCommit: 'b'.repeat(40),
+ mainCommit: 'c'.repeat(40),
+ mainRemoteCommit: 'd'.repeat(40),
+ mainBehind: 7,
+ mainAhead: 2,
+};
+
+const locales = { en, 'zh-CN': zhCN, 'zh-TW': zhTW, ja, ko };
+async function show(
+ overrides: Partial<MakeSourcePreparation> = {},
+ locale: keyof typeof locales = 'zh-CN',
+) {
+ const i18n = createInstance();
+ await i18n.init({ lng: locale, resources: { [locale]: { translation: locales[locale] } } });
+ return render(
+ <I18nextProvider i18n={i18n}>
+ <CindyMakeSourceDetails source={{ ...source, ...overrides }} />
+ </I18nextProvider>,
+ );
+}
+
+afterEach(cleanup);
+
+describe('Cindy Make source summary', () => {
+ it.each(Object.keys(locales) as (keyof typeof locales)[])(
+ 'shows exactly three Git entries with short hashes in %s',
+ async (locale) => {
+ const { container } = await show({}, locale);
+ const terms = locales[locale].cindyMake.source.details;
+ expect(
+ Array.from(container.querySelectorAll('dt')).map((label) => label.textContent),
+ ).toEqual([terms.branch, terms.mainCommit, terms.currentBranch]);
+ expect(screen.getByText('cindy-personal')).toBeTruthy();
+ expect(screen.getByText('feature/active')).toBeTruthy();
+ expect(screen.getByText(terms.baseRef.replace('{{ref}}', 'main'))).toBeTruthy();
+ for (const commit of [source.baseCommit!, source.mainCommit!]) {
+ const hash = screen.getByText(commit.slice(0, 12));
+ expect(hash.className).toContain('break-all');
+ expect(hash.className).toContain('font-mono');
+ expect(hash.title).toBe(commit);
+ }
+ for (const hidden of [source.commit!, source.mainRemoteCommit!]) {
+ expect(container.textContent).not.toContain(hidden.slice(0, 12));
+ }
+ expect(container.textContent).not.toMatch(/cindyMake\.source|\{\{/);
+ },
+ );
+
+ it('shows main without requiring a local main branch or comparison counts', async () => {
+ await show({ mainRemoteCommit: undefined, mainBehind: undefined, mainAhead: undefined });
+ expect(screen.getByText(source.mainCommit!.slice(0, 12))).toBeTruthy();
+ expect(screen.queryByText('更新源码后查看')).toBeNull();
+ });
+
+ it('does not substitute stale local main for an unknown fetched main version', async () => {
+ await show({ mainCommit: undefined });
+ expect(screen.getByText('main 版本').nextElementSibling?.textContent).toBe('更新源码后查看');
+ expect(screen.queryByText(source.mainCommit!.slice(0, 12))).toBeNull();
+ });
+
+ it('does not use the personal branch or source ref as an unknown current branch', async () => {
+ await show({ currentBranch: undefined });
+ expect(screen.getByText('当前项目分支').nextElementSibling?.textContent).toBe('更新源码后查看');
+ expect(screen.getAllByText('cindy-personal')).toHaveLength(1);
+ });
+
+ it('shows detached HEAD as a fixed commit rather than a branch named HEAD', async () => {
+ await show({ currentBranch: null });
+ expect(screen.getByText('未在分支上(固定提交)')).toBeTruthy();
+ expect(screen.queryByText('HEAD')).toBeNull();
+ });
+
+ it('supports old snapshots while keeping the available personal baseline', async () => {
+ await show({ mainCommit: undefined, mainRemoteCommit: undefined, currentBranch: undefined });
+ expect(screen.getByText('cindy-personal')).toBeTruthy();
+ expect(screen.getByText(source.baseCommit!.slice(0, 12))).toBeTruthy();
+ expect(screen.getAllByText('更新源码后查看')).toHaveLength(2);
+ });
+
+ it('keeps a release-tag baseline distinct from main', async () => {
+ await show({ ref: 'v1.2.3' });
+ expect(screen.getByText('基于 v1.2.3')).toBeTruthy();
+ expect(screen.queryByText('基于 main')).toBeNull();
+ });
+});
diff --git a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
index b313076c2f..3beb1b7e55 100644
--- a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
@@ -20,7 +20,6 @@ import type { AgentInputReference } from '@cindy/maker-shared/agent-input-projec
import { requiresFullAccessConfirmation } from '@cindy/maker-shared/permission-mode';
import { ImageLightbox } from '@/components/chat/ImageLightbox';
import { ImageHoverPreview } from '@/components/chat/ImageHoverPreview';
-import { CindyMakeCommandDialog } from '@/components/chat/CindyMakeCommandDialog';
import { formatBytes, TextLightbox } from '@/components/chat/TextLightbox';
import { AttachmentTypeThumb } from './AttachmentTypeThumb';
import { FullAccessConfirmContent } from './FullAccessConfirmContent';
@@ -1154,7 +1153,6 @@ export function ChatInput({
const deviceLinkDeviceId = _deviceLinkDeviceId;
const { t } = useTranslation();
const navigate = useNavigate();
- const [makeDialogSessionId, setMakeDialogSessionId] = useState<string | null>(null);
const { preference: composerSendShortcutPreference } = useComposerSendShortcutPreference();
// ── 推荐提示词 ────────────────────────────────────────────────────
// 设置开关:通过 shared hook 订阅,与 TipsSection 同源,切换后立即生效。
@@ -5207,7 +5205,9 @@ export function ChatInput({
hydratedHistoryDocumentRef.current = null;
draftRef.current = null;
if (sourceStorageKey) clearComposerDraft(sourceStorageKey);
- setMakeDialogSessionId(makeResult.sessionId);
+ if (makeResult.sessionId !== sourceSessionId) {
+ navigate('/cc-agent/' + makeResult.sessionId);
+ }
return;
}
}
@@ -8154,13 +8154,6 @@ export function ChatInput({
return (
<div className="relative flex w-full flex-col items-center gap-4" data-chat-input-root>
- <CindyMakeCommandDialog
- sessionId={makeDialogSessionId}
- open={makeDialogSessionId !== null}
- onOpenChange={(open) => {
- if (!open) setMakeDialogSessionId(null);
- }}
- />
{/* 计划模式激活态 chip(输入框上方,与 GoalIndicator 同形)。-mb-2 抵一部分
root gap-4,让 chip 与输入框间距接近 GoalIndicator 的节奏。 */}
{planModeEntry && planModeEnabled && (
diff --git a/apps/desktop/src/renderer/components/settings/CindyMakeSection.tsx b/apps/desktop/src/renderer/components/settings/CindyMakeSection.tsx
index 91cb5dee4f..038596ab81 100644
--- a/apps/desktop/src/renderer/components/settings/CindyMakeSection.tsx
+++ b/apps/desktop/src/renderer/components/settings/CindyMakeSection.tsx
@@ -1,5 +1,5 @@
-import { useEffect, useState } from 'react';
-import { ChevronDown, ChevronRight, GitBranch, Wrench } from 'lucide-react';
+import { useEffect, useRef, useState } from 'react';
+import { ChevronDown, ChevronRight, GitBranch, Plus, Wrench } from 'lucide-react';
import { useTranslation } from 'react-i18next';
import { Switch } from '@/components/ui/switch';
@@ -7,15 +7,24 @@ import { Button } from '@/components/ui/button';
import { useConfirmDialog } from '@/components/ui/confirm-dialog-provider';
import { Spinner } from '@/components/ui/spinner';
import { MakeDoctorReportCard } from '@/components/chat/CindyMakeDoctorCard';
+import { CindyMakeSourceDetails } from '@/components/cindy-make/CindyMakeSourceDetails';
+import { CindyMakeCreateDialog } from '@/components/cindy-make/CindyMakeCreateDialog';
import { cancelMakeDoctor, startMakeDoctor } from '@/lib/cindyMakeDoctor';
import { useCindyMakeSettings } from '@/lib/cindyMakeSettings';
import { toast } from '@/lib/toast';
-import type { MakeDoctorReport, MakeSourceStatus } from '../../../shared/cindyMakeDoctor';
+import type {
+ CindyMakeGlobalState,
+ MakeDoctorReport,
+ MakeSourceStatus,
+} from '../../../shared/cindyMakeDoctor';
export function CindyMakeSection() {
const { t } = useTranslation();
const { forceManagedTools, setForceManagedTools } = useCindyMakeSettings();
+ const [createOpen, setCreateOpen] = useState(false);
const [report, setReport] = useState<MakeDoctorReport>();
+ const [backgroundPreparation, setBackgroundPreparation] = useState<MakeDoctorReport>();
+ const environmentSelection = useRef(0);
const [checkVersion, setCheckVersion] = useState(0);
const [runMode, setRunMode] = useState<'check' | 'prepare'>('check');
const [runVersion, setRunVersion] = useState(0);
@@ -29,6 +38,41 @@ export function CindyMakeSection() {
const [sourceStatus, setSourceStatus] = useState<MakeSourceStatus>();
const [sourceRunPending, setSourceRunPending] = useState(false);
const { confirm } = useConfirmDialog();
+ useEffect(() => {
+ let active = true;
+ let latestPush: CindyMakeGlobalState | undefined;
+ const selection = environmentSelection.current;
+ setBackgroundPreparation(undefined);
+ const applyState = (state: CindyMakeGlobalState, restoreCompletion = false) => {
+ if (!active) return;
+ const snapshot = state.environmentPrepare;
+ if (!snapshot || (snapshot.report.forceManagedTools === true) !== forceManagedTools) return;
+ setBackgroundPreparation((current) =>
+ snapshot.active || restoreCompletion || current?.runId === snapshot.report.runId
+ ? snapshot.report
+ : current,
+ );
+ };
+ const unsubscribe = window.electronAPI.onCindyMakeState?.((state) => {
+ latestPush = state;
+ applyState(state);
+ });
+ Promise.resolve(window.electronAPI.getCindyMakeState?.())
+ .then((state) => {
+ if (!state || selection !== environmentSelection.current) return;
+ if (!latestPush) applyState(state);
+ else if (
+ state.environmentPrepare?.active &&
+ latestPush.environmentPrepare?.report.runId === state.environmentPrepare.report.runId
+ )
+ applyState(latestPush, true);
+ })
+ .catch(() => undefined);
+ return () => {
+ active = false;
+ unsubscribe?.();
+ };
+ }, [forceManagedTools]);
useEffect(() => {
let active = true;
const unsubscribe =
@@ -88,6 +132,7 @@ export function CindyMakeSection() {
return () => controller.abort();
}, [forceManagedTools, checkVersion, runMode, runVersion]);
const sourceBusy = sourceRunPending || sourceStatus?.status === 'preparing';
+ const displayReport = backgroundPreparation ?? report;
return (
<div className="flex flex-col gap-[18px]">
@@ -99,7 +144,12 @@ export function CindyMakeSection() {
<p className="mt-2 text-13 leading-[1.45] text-[var(--settings-section-desc)]">
{t('settings.cindyMake.description')}
</p>
+ <Button className="mt-3" onClick={() => setCreateOpen(true)}>
+ <Plus size={14} aria-hidden="true" />
+ {t('settings.cindyMake.create.title')}
+ </Button>
</div>
+ {createOpen && <CindyMakeCreateDialog onOpenChange={setCreateOpen} />}
{import.meta.env.DEV && (
<div className="flex flex-col gap-3 rounded-xl border border-[var(--settings-theme-card-border)] bg-[var(--settings-theme-card-bg)] p-5">
@@ -133,13 +183,15 @@ export function CindyMakeSection() {
</div>
)}
- {report ? (
+ {displayReport ? (
<MakeDoctorReportCard
- report={report}
+ report={displayReport}
showSource={false}
showSteps={false}
alwaysAllowRecheck
onPrepare={() => {
+ environmentSelection.current += 1;
+ setBackgroundPreparation(undefined);
setRunMode('prepare');
setRunVersion((version) => version + 1);
}}
@@ -152,11 +204,13 @@ export function CindyMakeSection() {
.catch(() => toast.error(t('cindyMakeDoctor.failed')));
}}
onStop={() => {
- void cancelMakeDoctor(report.runId, report.mode).catch(() =>
+ void cancelMakeDoctor(displayReport.runId, displayReport.mode).catch(() =>
toast.error(t('cindyMakeDoctor.failed')),
);
}}
onRecheck={() => {
+ environmentSelection.current += 1;
+ setBackgroundPreparation(undefined);
setRunMode('check');
setCheckVersion((version) => version + 1);
}}
@@ -255,52 +309,14 @@ function CindyMakeSourceStatusCard({
<p className="text-13 text-[var(--text-secondary)]">
{t('settings.cindyMake.source.description')}
</p>
- <dl className="grid gap-1 text-12 text-[var(--text-secondary)]">
+ {(status.branch || status.commit || status.status === 'ready') && (
+ <CindyMakeSourceDetails source={status} />
+ )}
+ <dl className="grid gap-1 text-12 text-[var(--text-tertiary)]">
<div>
<dt className="inline font-medium">{t('settings.cindyMake.source.path')}: </dt>
<dd className="inline break-all font-mono">{status.path}</dd>
</div>
- {status.channel && (
- <div>
- <dt className="inline font-medium">{t('settings.cindyMake.source.channel')}: </dt>
- <dd className="inline">{status.channel}</dd>
- </div>
- )}
- {status.version && (
- <div>
- <dt className="inline font-medium">{t('settings.cindyMake.source.version')}: </dt>
- <dd className="inline">{status.version}</dd>
- </div>
- )}
- {status.ref && (
- <div>
- <dt className="inline font-medium">{t('settings.cindyMake.source.ref')}: </dt>
- <dd className="inline">{status.ref}</dd>
- </div>
- )}
- {status.branch && (
- <div>
- <dt className="inline font-medium">{t('settings.cindyMake.source.branch')}: </dt>
- <dd className="inline font-mono">{status.branch}</dd>
- </div>
- )}
- {status.commit && (
- <div>
- <dt className="inline font-medium">{t('settings.cindyMake.source.commit')}: </dt>
- <dd className="inline break-all font-mono">{status.commit}</dd>
- </div>
- )}
- {status.baseCommit && (
- <div>
- <dt className="inline font-medium">
- {t('settings.cindyMake.source.baseCommit')}:{' '}
- </dt>
- <dd className="inline break-all font-mono">
- {status.ref ? `${status.ref} ` : ''}
- {status.baseCommit}
- </dd>
- </div>
- )}
{status.error && (
<div className="text-[var(--status-danger)]">
{t(`cindyMake.source.errors.${status.error}`)}
@@ -308,12 +324,17 @@ function CindyMakeSourceStatusCard({
)}
</dl>
{preparing && status.progress && (
- <div
- className="flex items-center gap-2 text-12 text-[var(--text-secondary)]"
- aria-live="polite"
- >
- <Spinner size={14} />
- <span>{t(`cindyMake.source.gitProgress.${status.progress.stage}`)}</span>
+ <div className="space-y-1 text-12 text-[var(--text-secondary)]" aria-live="polite">
+ <div className="flex items-center gap-2">
+ <Spinner size={14} />
+ <span>{t(`cindyMake.source.gitProgress.${status.progress.stage}`)}</span>
+ <span className="text-[var(--text-tertiary)]">({status.progress.percent}%)</span>
+ </div>
+ {status.progress.message && (
+ <p className="break-all pl-5 font-mono text-11 text-[var(--text-tertiary)]">
+ {status.progress.message}
+ </p>
+ )}
</div>
)}
</div>
diff --git a/apps/desktop/src/renderer/components/settings/__tests__/CindyMakeSection.test.tsx b/apps/desktop/src/renderer/components/settings/__tests__/CindyMakeSection.test.tsx
index 7fe21d7c97..28e55b3204 100644
--- a/apps/desktop/src/renderer/components/settings/__tests__/CindyMakeSection.test.tsx
+++ b/apps/desktop/src/renderer/components/settings/__tests__/CindyMakeSection.test.tsx
@@ -1,10 +1,15 @@
// @vitest-environment jsdom
import { act, cleanup, fireEvent, render, screen, waitFor, within } from '@testing-library/react';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { MemoryRouter } from 'react-router-dom';
import { CindyMakeSection } from '../CindyMakeSection';
import { startMakeDoctor } from '@/lib/cindyMakeDoctor';
import { setCindyMakeForceManagedTools } from '@/lib/cindyMakeSettings';
-import type { MakeDoctorReport, MakeSourceStatus } from '../../../../shared/cindyMakeDoctor';
+import type {
+ CindyMakeGlobalState,
+ MakeDoctorReport,
+ MakeSourceStatus,
+} from '../../../../shared/cindyMakeDoctor';
vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string) => key }) }));
vi.mock('@/lib/toast', () => ({ toast: { error: vi.fn() } }));
@@ -21,8 +26,17 @@ type Result = Awaited<ReturnType<NonNullable<Api>['executeDesktopCommand']>>;
function harness() {
const listeners = new Set<Listener>();
const sourceListeners = new Set<(status: MakeSourceStatus) => void>();
+ const stateListeners = new Set<(state: CindyMakeGlobalState) => void>();
+ let globalState: CindyMakeGlobalState = {};
const runs = new Map<string, (result: Result) => void>();
const api = {
+ getCindyMakeState: vi.fn(async () => globalState),
+ onCindyMakeState: (listener: (state: CindyMakeGlobalState) => void) => {
+ stateListeners.add(listener);
+ return () => {
+ stateListeners.delete(listener);
+ };
+ },
openCindyMakeToolsDir: vi.fn(async () => ({ success: true })),
getCindyMakeSourceStatus: vi.fn(async () => undefined as MakeSourceStatus | undefined),
openCindyMakeSourceDir: vi.fn(async () => ({ success: true })),
@@ -48,6 +62,8 @@ function harness() {
};
vi.stubGlobal('electronAPI', {
maker: api,
+ getCindyMakeState: api.getCindyMakeState,
+ onCindyMakeState: api.onCindyMakeState,
openCindyMakeToolsDir: api.openCindyMakeToolsDir,
getCindyMakeSourceStatus: api.getCindyMakeSourceStatus,
openCindyMakeSourceDir: api.openCindyMakeSourceDir,
@@ -77,7 +93,13 @@ function harness() {
runs.get(runId)!({ success: true, doctorReport: report });
});
};
- return { api, starts, complete, listeners, pushSource };
+ const pushState = async (state: CindyMakeGlobalState) => {
+ await act(async () => {
+ globalState = state;
+ for (const listener of stateListeners) listener(state);
+ });
+ };
+ return { api, starts, complete, listeners, pushSource, pushState, stateListeners };
}
beforeEach(() => {
@@ -92,6 +114,199 @@ afterEach(() => {
});
describe('Settings > Cindy Make', () => {
+ it('restores a background installation after reentry, keeps completion, and stops the real run', async () => {
+ const environment = harness();
+ const first = render(<CindyMakeSection />);
+ await environment.complete(environment.starts()[0][1].doctorRunId!, '', [
+ { id: 'node', status: 'missing' },
+ ]);
+ fireEvent.click(screen.getByText('cindyMake.prepare.install'));
+ const preparationId = environment.starts()[1][1].doctorRunId!;
+ const preparation: MakeDoctorReport = {
+ runId: preparationId,
+ mode: 'prepare',
+ platform: 'win32',
+ arch: 'x64',
+ status: 'running',
+ checks: [
+ { id: 'node', status: 'downloading', progress: { loaded: 42, total: 100, percent: 42 } },
+ ],
+ };
+ await environment.pushState({ environmentPrepare: { active: true, report: preparation } });
+ first.unmount();
+ expect(environment.stateListeners.size).toBe(0);
+ const second = render(<CindyMakeSection />);
+ await screen.findByText('cindyMake.prepare.stop');
+ const reentryCheckId = environment.starts()[2][1].doctorRunId!;
+ await environment.complete(reentryCheckId, '', [{ id: 'node', status: 'missing' }]);
+ expect(screen.queryByText('cindyMake.prepare.install')).toBeNull();
+ fireEvent.click(screen.getByText('cindyMakeDoctor.details'));
+ expect(screen.getByRole('progressbar').getAttribute('aria-valuenow')).toBe('42');
+ expect(environment.stateListeners.size).toBe(1);
+ expect(
+ environment.api.executeDesktopCommand.mock.calls.some(
+ ([, ctx]) => ctx.doctorAction === 'cancel',
+ ),
+ ).toBe(false);
+ fireEvent.click(screen.getByText('cindyMake.prepare.stop'));
+ expect(environment.api.executeDesktopCommand).toHaveBeenLastCalledWith('cindy-make', {
+ doctorRunId: preparationId,
+ doctorAction: 'cancel',
+ });
+ await environment.pushState({
+ environmentPrepare: {
+ active: false,
+ report: {
+ ...preparation,
+ status: 'completed',
+ checks: [{ id: 'node', status: 'passed', version: '24.16.0' }],
+ },
+ },
+ });
+ expect(screen.getByRole('status').textContent).toContain('cindyMake.prepare.passed');
+ expect(screen.queryByRole('progressbar')).toBeNull();
+ fireEvent.click(screen.getByText('cindyMake.prepare.retry'));
+ await environment.complete(environment.starts()[3][1].doctorRunId!, '', [
+ { id: 'node', status: 'missing' },
+ ]);
+ expect(screen.getByText('cindyMake.prepare.install')).toBeTruthy();
+ expect(environment.starts().filter(([command]) => command === 'cindy-make')).toHaveLength(1);
+ second.unmount();
+ expect(environment.stateListeners.size).toBe(0);
+ await environment.complete(preparationId, '24.16.0');
+ });
+
+ it('ignores a stale initial snapshot after newer preparation progress arrives', async () => {
+ const environment = harness();
+ let resolveSnapshot!: (state: CindyMakeGlobalState) => void;
+ environment.api.getCindyMakeState.mockImplementationOnce(
+ () =>
+ new Promise((resolve) => {
+ resolveSnapshot = resolve;
+ }),
+ );
+ render(<CindyMakeSection />);
+ const preparation: MakeDoctorReport = {
+ runId: 'new-preparation',
+ mode: 'prepare',
+ platform: 'win32',
+ arch: 'x64',
+ status: 'running',
+ checks: [{ id: 'node', status: 'installing' }],
+ };
+ await environment.pushState({ environmentPrepare: { active: true, report: preparation } });
+ await act(async () =>
+ resolveSnapshot({
+ environmentPrepare: {
+ active: true,
+ report: { ...preparation, runId: 'old-preparation' },
+ },
+ }),
+ );
+ fireEvent.click(screen.getByText('cindyMake.prepare.stop'));
+ expect(environment.api.executeDesktopCommand).toHaveBeenLastCalledWith('cindy-make', {
+ doctorRunId: 'new-preparation',
+ doctorAction: 'cancel',
+ });
+ });
+
+ it('restores completion that arrives before the initial active snapshot', async () => {
+ const environment = harness();
+ let resolveSnapshot!: (state: CindyMakeGlobalState) => void;
+ environment.api.getCindyMakeState.mockImplementationOnce(
+ () =>
+ new Promise((resolve) => {
+ resolveSnapshot = resolve;
+ }),
+ );
+ render(<CindyMakeSection />);
+ const preparation: MakeDoctorReport = {
+ runId: 'finishing-preparation',
+ mode: 'prepare',
+ platform: 'win32',
+ arch: 'x64',
+ status: 'completed',
+ checks: [{ id: 'node', status: 'passed', version: '24.16.0' }],
+ };
+ await environment.pushState({ environmentPrepare: { active: false, report: preparation } });
+ await environment.complete(environment.starts()[0][1].doctorRunId!, '', [
+ { id: 'node', status: 'missing' },
+ ]);
+ await act(async () =>
+ resolveSnapshot({
+ environmentPrepare: {
+ active: true,
+ report: {
+ ...preparation,
+ status: 'running',
+ checks: [{ id: 'node', status: 'installing' }],
+ },
+ },
+ }),
+ );
+ expect(screen.getByRole('status').textContent).toContain('cindyMake.prepare.passed');
+ expect(screen.queryByText('cindyMake.prepare.install')).toBeNull();
+ });
+
+ it('does not let a delayed initial snapshot undo an explicit recheck', async () => {
+ const environment = harness();
+ let resolveSnapshot!: (state: CindyMakeGlobalState) => void;
+ environment.api.getCindyMakeState.mockImplementationOnce(
+ () =>
+ new Promise((resolve) => {
+ resolveSnapshot = resolve;
+ }),
+ );
+ render(<CindyMakeSection />);
+ const preparation: MakeDoctorReport = {
+ runId: 'completed-preparation',
+ mode: 'prepare',
+ platform: 'win32',
+ arch: 'x64',
+ status: 'running',
+ checks: [{ id: 'node', status: 'installing' }],
+ };
+ await environment.pushState({ environmentPrepare: { active: true, report: preparation } });
+ await environment.pushState({
+ environmentPrepare: {
+ active: false,
+ report: {
+ ...preparation,
+ status: 'completed',
+ checks: [{ id: 'node', status: 'passed' }],
+ },
+ },
+ });
+ fireEvent.click(screen.getByText('cindyMake.prepare.retry'));
+ await act(async () =>
+ resolveSnapshot({ environmentPrepare: { active: true, report: preparation } }),
+ );
+ await environment.complete(environment.starts()[1][1].doctorRunId!, '', [
+ { id: 'node', status: 'missing' },
+ ]);
+ expect(screen.getByText('cindyMake.prepare.install')).toBeTruthy();
+ expect(screen.queryByText('cindyMake.prepare.retry')).toBeNull();
+ });
+
+ it('offers an explicit creation form without starting preparation on open or cancel', async () => {
+ const environment = harness();
+ render(
+ <MemoryRouter>
+ <CindyMakeSection />
+ </MemoryRouter>,
+ );
+ const entry = screen.getByRole('button', { name: 'settings.cindyMake.create.title' });
+ entry.focus();
+ fireEvent.click(entry);
+ expect(screen.getByRole('dialog', { name: 'settings.cindyMake.create.title' })).toBeTruthy();
+ expect(screen.getByRole('textbox')).toBeTruthy();
+ fireEvent.click(screen.getByRole('button', { name: 'settings.cindyMake.create.cancel' }));
+ expect(screen.queryByRole('dialog')).toBeNull();
+ await waitFor(() => expect(document.activeElement).toBe(entry));
+ expect(environment.starts()).toHaveLength(1);
+ expect(environment.starts()[0][0]).toBe('cindy-make-doctor');
+ });
+
it('checks on each entry without creating a task or starting preparation, and allows recheck after all passed', async () => {
const h = harness();
const first = render(<CindyMakeSection />);
@@ -133,6 +348,13 @@ describe('Settings > Cindy Make', () => {
version: '0.0.0-dev',
ref: 'main',
commit: '0123456789abcdef',
+ branch: 'cindy-personal',
+ currentBranch: 'main',
+ baseCommit: 'b'.repeat(40),
+ mainCommit: 'c'.repeat(40),
+ mainRemoteCommit: 'd'.repeat(40),
+ mainBehind: 3,
+ mainAhead: 0,
};
h.api.getCindyMakeSourceStatus = vi.fn(async () => source);
h.api.openCindyMakeSourceDir = vi.fn(async () => ({ success: true }));
@@ -145,8 +367,22 @@ describe('Settings > Cindy Make', () => {
cancelCindyMakeSource: h.api.cancelCindyMakeSource,
});
render(<CindyMakeSection />);
- await waitFor(() => expect(screen.getByText('0123456789abcdef')).toBeTruthy());
+ await waitFor(() => expect(screen.getByText('c'.repeat(12))).toBeTruthy());
const sourceCard = screen.getByRole('region', { name: 'settings.cindyMake.source.title' });
+ expect(within(sourceCard).getByText('cindy-personal')).toBeTruthy();
+ for (const hash of [source.baseCommit, source.mainCommit]) {
+ expect(within(sourceCard).getByText(hash!.slice(0, 12))).toBeTruthy();
+ }
+ expect(within(sourceCard).getByText('main')).toBeTruthy();
+ expect(within(sourceCard).queryByText('settings.cindyMake.source.ref')).toBeNull();
+ expect(within(sourceCard).queryByText('0123456789abcdef')).toBeNull();
+ await h.pushSource({
+ ...source,
+ currentBranch: 'feature/next',
+ mainCommit: 'e'.repeat(40),
+ });
+ expect(within(sourceCard).getByText('feature/next')).toBeTruthy();
+ expect(within(sourceCard).getByText('e'.repeat(12))).toBeTruthy();
const statusLine = within(sourceCard).getByRole('status');
const footer = statusLine.parentElement!;
const openButton = within(sourceCard).getByText('settings.cindyMake.source.openDir');
@@ -160,7 +396,7 @@ describe('Settings > Cindy Make', () => {
fireEvent.click(
within(sourceCard).getByRole('button', { name: 'settings.cindyMake.source.title' }),
);
- expect(within(sourceCard).queryByText('0123456789abcdef')).toBeNull();
+ expect(within(sourceCard).queryByText('e'.repeat(12))).toBeNull();
expect(within(sourceCard).getByRole('status')).toBeTruthy();
expect(within(sourceCard).getByText('settings.cindyMake.source.openDir')).toBeTruthy();
@@ -168,29 +404,34 @@ describe('Settings > Cindy Make', () => {
expect(h.api.openCindyMakeSourceDir).toHaveBeenCalledTimes(1);
});
- it('shows a source job started elsewhere and stops it from Settings', async () => {
- const h = harness();
- h.api.getCindyMakeSourceStatus.mockResolvedValue({
- status: 'preparing',
- path: 'C:\\managed\\source',
- ref: 'main',
- phase: 'cloning',
- });
- render(<CindyMakeSection />);
- const sourceCard = await screen.findByRole('region', {
- name: 'settings.cindyMake.source.title',
- });
- expect(within(sourceCard).getByText(/cindyMake.source.phase.cloning/)).toBeTruthy();
- expect(within(sourceCard).queryByText('settings.cindyMake.source.prepare')).toBeNull();
- expect(within(sourceCard).queryByText('settings.cindyMake.source.reset')).toBeNull();
- fireEvent.click(within(sourceCard).getByText('settings.cindyMake.source.stop'));
- expect(h.api.cancelCindyMakeSource).toHaveBeenCalledTimes(1);
- // Settings itself never started a doctor run for this job.
- expect(h.starts().filter(([name]) => name === 'cindy-make')).toHaveLength(0);
- await h.pushSource({ status: 'cancelled', path: 'C:\\managed\\source', error: 'cancelled' });
- expect(within(sourceCard).getByText('settings.cindyMake.source.prepare')).toBeTruthy();
- expect(within(sourceCard).getByText('settings.cindyMake.source.reset')).toBeTruthy();
- });
+ it.each(['cloning', 'installing'] as const)(
+ 'shows a source job %s elsewhere and stops it from Settings',
+ async (phase) => {
+ const h = harness();
+ h.api.getCindyMakeSourceStatus.mockResolvedValue({
+ status: 'preparing',
+ path: 'C:\\managed\\source',
+ ref: 'main',
+ phase,
+ });
+ render(<CindyMakeSection />);
+ const sourceCard = await screen.findByRole('region', {
+ name: 'settings.cindyMake.source.title',
+ });
+ expect(
+ within(sourceCard).getByText(new RegExp('cindyMake.source.phase.' + phase)),
+ ).toBeTruthy();
+ expect(within(sourceCard).queryByText('settings.cindyMake.source.prepare')).toBeNull();
+ expect(within(sourceCard).queryByText('settings.cindyMake.source.reset')).toBeNull();
+ fireEvent.click(within(sourceCard).getByText('settings.cindyMake.source.stop'));
+ expect(h.api.cancelCindyMakeSource).toHaveBeenCalledTimes(1);
+ // Settings itself never started a doctor run for this job.
+ expect(h.starts().filter(([name]) => name === 'cindy-make')).toHaveLength(0);
+ await h.pushSource({ status: 'cancelled', path: 'C:\\managed\\source', error: 'cancelled' });
+ expect(within(sourceCard).getByText('settings.cindyMake.source.prepare')).toBeTruthy();
+ expect(within(sourceCard).getByText('settings.cindyMake.source.reset')).toBeTruthy();
+ },
+ );
it('keeps the clear action for a failed checkout so a dirty tree has a way out', async () => {
const h = harness();
@@ -352,15 +593,14 @@ describe('Settings > Cindy Make', () => {
).toBe(false);
});
- it('changing the switch cancels the old check, ignores late results, and carries the option into the chat command', async () => {
+ it('changing the switch leaves the old check running, ignores late results, and carries the option into the chat command', async () => {
const h = harness();
const view = render(<CindyMakeSection />);
const oldRun = h.starts()[0][1].doctorRunId!;
fireEvent.click(screen.getByRole('switch'));
- expect(h.api.executeDesktopCommand).toHaveBeenCalledWith('cindy-make-doctor', {
- doctorRunId: oldRun,
- doctorAction: 'cancel',
- });
+ expect(
+ h.api.executeDesktopCommand.mock.calls.some(([, ctx]) => ctx.doctorAction === 'cancel'),
+ ).toBe(false);
const latest = h.starts()[1][1];
expect(latest.forceManagedTools).toBe(true);
await h.complete(latest.doctorRunId!, '22.23.2', [
@@ -391,14 +631,14 @@ describe('Settings > Cindy Make', () => {
await h.complete(normalRun, '24.1.0');
});
- it('leaving the page cancels only its own check and removes the progress subscription immediately', () => {
+ it('leaving the page only removes its progress subscription and does not cancel the check', () => {
const h = harness();
const view = render(<CindyMakeSection />);
const runId = h.starts()[0][1].doctorRunId;
expect(h.listeners.size).toBe(1);
view.unmount();
expect(h.listeners.size).toBe(0);
- expect(h.api.executeDesktopCommand).toHaveBeenLastCalledWith('cindy-make-doctor', {
+ expect(h.api.executeDesktopCommand).not.toHaveBeenCalledWith('cindy-make-doctor', {
doctorRunId: runId,
doctorAction: 'cancel',
});
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index 85020a32e8..e8fd309bbc 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -5658,6 +5658,16 @@
"permissionModeDisabled": "This permission mode is unavailable because remote IM uses Cindy Desktop's confirmation policy."
},
"cindyMake": {
+ "create": {
+ "title": "Create a Personal Build",
+ "cancel": "Cancel",
+ "description": "Describe what you want to change in Cindy. A task will open with the same workflow to check your environment, prepare the source, and continue making your build.",
+ "requestLabel": "What would you like to change?",
+ "requestHint": "Up to {{max}} characters. Follow progress in the task after submitting. Leaving Settings will not stop preparation.",
+ "placeholder": "For example: add a filter button to show only unfinished tasks in the task list.",
+ "continue": "Start Making",
+ "failed": "Could not start making your build. Your request is still here; please try again."
+ },
"title": "Cindy Make",
"openToolsDir": "Open tools folder",
"source": {
@@ -5668,10 +5678,6 @@
"update": "Update source",
"preparingAction": "Preparing source",
"path": "Path",
- "channel": "Channel",
- "version": "Version",
- "ref": "Ref",
- "commit": "Commit",
"status": {
"missing": "No personal source has been prepared",
"pending": "Preparing source checkout",
@@ -5686,8 +5692,6 @@
"confirm": "Clear source",
"cancel": "Cancel"
},
- "branch": "Personal branch",
- "baseCommit": "Baseline",
"description": "The source copy behind your personal Cindy build. Each build task gets its own workspace branched from the personal branch, and tested changes merge back; this folder itself is never edited directly.",
"stop": "Stop"
},
@@ -12542,20 +12546,22 @@
"needRequest": "Describe the change, including a feature name or error, to search upstream.",
"placeholder": "For example: fix message stream flickering",
"search": "Search upstream",
- "searching": "Searching upstream Issues and PRs…",
- "found": "Found potentially related upstream work",
- "notFound": "No matching upstream work found",
+ "searching": "Searching related upstream PRs…",
+ "found": "Found potentially related PRs",
+ "notFound": "No additional matching PRs found",
"failed": "Upstream search failed",
"cancelled": "Upstream search stopped",
"terms": "Keywords: {{terms}}",
"author": "by {{author}}",
"updated": "updated {{date}}",
- "notFoundHint": "No public Issue or PR matched these keywords. Different wording may return other results.",
- "resultHint": "Review the links to judge relevance. Results include only currently open Issues and PRs.",
+ "expand": "Show results",
+ "collapse": "Hide results",
+ "notFoundHint": "No additional candidates were found in this keyword search. Different wording may return other PRs.",
+ "resultHint": "Results include open and merged PRs. PRs confirmed in your running build are excluded. Review the links to judge relevance; merged does not mean released.",
"wait": "Wait for upstream",
"personal": "Continue with a personal version",
"retry": "Recheck and search again",
- "count": "Found {{count}} potentially related open Issues or PRs",
+ "count": "{{count}} potentially related PRs to review",
"kind": {
"issue": "Issue",
"pr": "PR"
@@ -12579,6 +12585,22 @@
"rateLimit": "GitHub is limiting requests. Wait a moment and retry.",
"timeout": "The search timed out. Please retry.",
"invalidResponse": "GitHub returned an incomplete or unreadable result. Please retry."
+ },
+ "runtimeUnknown": "The running source version is uncertain (for example, a modified Dev build). Candidates are kept for review.",
+ "excludedIncluded": "{{count}} PRs already in the running version were excluded.",
+ "limitedHint": "Only a limited set of results was checked. Refine the request to search more precisely.",
+ "runtimeVersion": "Running build: {{channel}} {{version}} · {{commit}}",
+ "unknownCommit": "unknown commit",
+ "draft": "Draft",
+ "channel": {
+ "dev": "Dev",
+ "beta": "Beta",
+ "release": "Release"
+ },
+ "inclusion": {
+ "included": "Included in the running version",
+ "notIncluded": "Not in the running version",
+ "unknown": "Inclusion in the running version is unverified"
}
},
"title": "Cindy Make",
@@ -12592,8 +12614,10 @@
"cloning": "Downloading source",
"fetching": "Refreshing repository",
"checkingOut": "Selecting version",
- "preparingBranch": "Preparing personal branch"
+ "preparingBranch": "Preparing personal branch",
+ "installing": "Installing dependencies"
},
+ "pending": "Waiting to prepare source",
"ready": "Source is ready",
"failed": "Source preparation failed",
"cancelled": "Source preparation stopped",
@@ -12617,8 +12641,15 @@
"checkingOut": "Updating files"
},
"missing": "No source is prepared",
- "personalBranch": "Personal branch {{branch}}",
- "baseCommit": "Based on {{ref}} {{commit}}"
+ "details": {
+ "branch": "Personal Branch",
+ "baseRef": "Based on {{ref}}",
+ "baseCommit": "Based on",
+ "mainCommit": "main Version",
+ "currentBranch": "Current Project Branch",
+ "detached": "No branch (fixed commit)",
+ "unknown": "Update source to check"
+ }
},
"code": {
"starting": "Opening personal build task",
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index e631c10ea7..abfe6861ac 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -5656,6 +5656,16 @@
"permissionModeDisabled": "リモート IM は Cindy Desktop の確認ポリシーを使用するため、この権限モードは利用できません。"
},
"cindyMake": {
+ "create": {
+ "title": "個人版を作成",
+ "cancel": "キャンセル",
+ "description": "Cindy をどのように変えたいか教えてください。制作タスクを開き、共通のフローで環境の確認、ソースコードの準備を行ってから制作を進めます。",
+ "requestLabel": "どのように変えたいですか?",
+ "requestHint": "最大 {{max}} 文字。送信後はタスクで進捗を確認できます。設定を離れても準備は止まりません。",
+ "placeholder": "例:タスクリストに未完了のタスクだけを表示するフィルターボタンを追加したい。",
+ "continue": "制作を開始",
+ "failed": "制作を開始できませんでした。入力内容は保持されています。もう一度お試しください。"
+ },
"title": "Cindy Make",
"openToolsDir": "ツールフォルダを開く",
"source": {
@@ -5666,10 +5676,6 @@
"update": "ソースを更新",
"preparingAction": "ソースを準備中",
"path": "パス",
- "channel": "チャンネル",
- "version": "バージョン",
- "ref": "Ref",
- "commit": "コミット",
"status": {
"missing": "個人版のソースコードは未準備です",
"pending": "ソースを準備中",
@@ -5684,8 +5690,6 @@
"confirm": "ソースを削除",
"cancel": "キャンセル"
},
- "branch": "個人版ブランチ",
- "baseCommit": "ベースライン",
"description": "個人版 Cindy のソースコピーです。個人版を作るたびに個人版ブランチから独立した作業ディレクトリを作成し、テスト済みの変更をここへマージします。このディレクトリ自体を直接編集することはありません。",
"stop": "停止"
},
@@ -12525,20 +12529,22 @@
"needRequest": "変更したい機能名や具体的なエラーを入力して、関連する上流の内容を検索します。",
"placeholder": "例:メッセージ表示のちらつきを修正",
"search": "上流を検索",
- "searching": "上流の Issue と PR を検索中…",
- "found": "関連する可能性のある上流の内容が見つかりました",
- "notFound": "一致する上流の内容は見つかりませんでした",
+ "searching": "関連する上流 PR を検索中…",
+ "found": "関連する可能性のある PR が見つかりました",
+ "notFound": "ほかに一致する PR は見つかりませんでした",
"failed": "上流の検索に失敗しました",
"cancelled": "上流の検索を停止しました",
"terms": "検索語:{{terms}}",
"author": "作成者:{{author}}",
"updated": "更新日:{{date}}",
- "notFoundHint": "これらの検索語に一致する公開 Issue や PR はありませんでした。表現を変えると別の結果が見つかる場合があります。",
- "resultHint": "リンクを開いて関連性を確認してください。現在オープン中の Issue と PR のみ表示しています。",
+ "expand": "検索結果を表示",
+ "collapse": "検索結果を隠す",
+ "notFoundHint": "今回のキーワード検索では追加の候補が見つかりませんでした。別の表現で検索すると、ほかの PR が見つかる場合があります。",
+ "resultHint": "未マージとマージ済みの PR を対象に、実行中のバージョンに含まれると確認できたものは除外します。関連性はリンク先で確認してください。マージ済みでも公開済みとは限りません。",
"wait": "上流を待つ",
"personal": "個人版の作成を続ける",
"retry": "環境を再確認して検索",
- "count": "関連する可能性のあるオープン Issue/PR が {{count}} 件見つかりました",
+ "count": "関連する可能性のある PR {{count}} 件",
"kind": {
"issue": "Issue",
"pr": "PR"
@@ -12562,6 +12568,22 @@
"rateLimit": "GitHub のリクエスト制限に達しました。しばらくしてから再試行してください。",
"timeout": "検索がタイムアウトしました。再試行してください。",
"invalidResponse": "GitHub の結果が不完全か読み取れません。再試行してください。"
+ },
+ "runtimeUnknown": "実行中のソースを正確に確認できません(ローカル変更のある Dev 版など)。候補の PR は確認用に残します。",
+ "excludedIncluded": "実行中のバージョンに含まれる PR {{count}} 件を除外しました。",
+ "limitedHint": "検索結果の一部のみを確認しました。要望を具体的にすると検索範囲を絞れます。",
+ "runtimeVersion": "実行中:{{channel}} {{version}} · {{commit}}",
+ "unknownCommit": "コミット不明",
+ "draft": "ドラフト",
+ "channel": {
+ "dev": "Dev",
+ "beta": "Beta",
+ "release": "リリース版"
+ },
+ "inclusion": {
+ "included": "実行中のバージョンに含まれます",
+ "notIncluded": "実行中のバージョンには含まれません",
+ "unknown": "実行中のバージョンに含まれるか未確認"
}
},
"title": "Cindy Make",
@@ -12575,8 +12597,10 @@
"cloning": "ソースをダウンロード中",
"fetching": "リポジトリを更新中",
"checkingOut": "バージョンを切替中",
- "preparingBranch": "個人版ブランチを準備中"
+ "preparingBranch": "個人版ブランチを準備中",
+ "installing": "依存関係をインストール中"
},
+ "pending": "ソースの準備を待っています",
"ready": "ソースの準備が完了しました",
"failed": "ソースの準備に失敗しました",
"cancelled": "ソースの準備を停止しました",
@@ -12600,8 +12624,15 @@
"checkingOut": "ファイルを更新中"
},
"missing": "ソースはまだ準備されていません",
- "personalBranch": "個人版ブランチ {{branch}}",
- "baseCommit": "{{ref}} {{commit}} を基準"
+ "details": {
+ "branch": "個人版ブランチ",
+ "baseRef": "{{ref}} を基準",
+ "baseCommit": "基準バージョン",
+ "mainCommit": "main のバージョン",
+ "currentBranch": "プロジェクトの現在のブランチ",
+ "detached": "ブランチなし(固定コミット)",
+ "unknown": "ソースを更新して確認"
+ }
},
"code": {
"starting": "個人版タスクを開いています",
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index 18f9091cbc..f7d855a41b 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -5656,6 +5656,16 @@
"permissionModeDisabled": "원격 IM은 Cindy Desktop의 확인 정책을 사용하므로 이 권한 모드를 사용할 수 없습니다."
},
"cindyMake": {
+ "create": {
+ "title": "개인 버전 만들기",
+ "cancel": "취소",
+ "description": "Cindy에서 바꾸고 싶은 내용을 알려주세요. 제작 작업을 열고 기존 공통 흐름에 따라 환경 확인과 소스 코드 준비를 거쳐 제작을 진행합니다.",
+ "requestLabel": "무엇을 바꾸고 싶으신가요?",
+ "requestHint": "최대 {{max}}자. 제출 후 작업에서 진행 상황을 확인할 수 있습니다. 설정을 나가도 준비는 멈추지 않습니다.",
+ "placeholder": "예: 작업 목록에서 미완료 작업만 보여주는 필터 버튼을 추가하고 싶어요.",
+ "continue": "제작 시작",
+ "failed": "제작을 시작하지 못했습니다. 입력 내용은 그대로 있으니 다시 시도해 주세요."
+ },
"title": "Cindy Make",
"openToolsDir": "도구 폴더 열기",
"source": {
@@ -5666,10 +5676,6 @@
"update": "소스 업데이트",
"preparingAction": "소스 준비 중",
"path": "경로",
- "channel": "채널",
- "version": "버전",
- "ref": "Ref",
- "commit": "커밋",
"status": {
"missing": "개인 소스가 아직 준비되지 않았습니다",
"pending": "소스 준비 중",
@@ -5684,8 +5690,6 @@
"confirm": "소스 정리",
"cancel": "취소"
},
- "branch": "개인 버전 브랜치",
- "baseCommit": "기준선",
"description": "개인 버전 Cindy의 소스 사본입니다. 개인 버전을 만들 때마다 개인 버전 브랜치에서 독립 작업 디렉터리를 만들고, 테스트를 통과한 변경을 여기로 병합합니다. 이 디렉터리 자체를 직접 수정하지는 않습니다.",
"stop": "중지"
},
@@ -12525,20 +12529,22 @@
"needRequest": "변경할 기능 이름이나 구체적인 오류를 입력해 관련 업스트림 작업을 검색하세요.",
"placeholder": "예: 메시지 스트림 깜박임 수정",
"search": "업스트림 검색",
- "searching": "업스트림 이슈와 PR 검색 중…",
- "found": "관련 가능성이 있는 업스트림 작업을 찾았습니다",
- "notFound": "일치하는 업스트림 작업을 찾지 못했습니다",
+ "searching": "관련 업스트림 PR 검색 중…",
+ "found": "관련 가능성이 있는 PR을 찾았습니다",
+ "notFound": "추가로 일치하는 PR을 찾지 못했습니다",
"failed": "업스트림 검색 실패",
"cancelled": "업스트림 검색 중지됨",
"terms": "검색어: {{terms}}",
"author": "작성자: {{author}}",
"updated": "업데이트: {{date}}",
- "notFoundHint": "이 검색어와 일치하는 공개 이슈 또는 PR이 없습니다. 다른 표현으로 검색하면 다른 결과가 나올 수 있습니다.",
- "resultHint": "링크를 열어 관련성을 확인하세요. 현재 열린 Issue와 PR만 표시됩니다.",
+ "expand": "검색 결과 보기",
+ "collapse": "검색 결과 접기",
+ "notFoundHint": "이번 키워드 검색에서는 추가 후보를 찾지 못했습니다. 다른 표현으로 검색하면 더 많은 PR을 찾을 수 있습니다.",
+ "resultHint": "미병합 및 병합된 PR을 검색하며 실행 중인 버전에 포함된 것으로 확인된 PR은 제외합니다. 링크에서 관련성을 확인하세요. 병합되었다고 출시된 것은 아닙니다.",
"wait": "업스트림 기다리기",
"personal": "개인 버전 제작 계속",
"retry": "환경 재확인 및 검색",
- "count": "관련 가능성이 있는 열린 Issue 또는 PR {{count}}개를 찾았습니다",
+ "count": "확인할 관련 가능성이 있는 PR {{count}}개",
"kind": {
"issue": "이슈",
"pr": "PR"
@@ -12562,6 +12568,22 @@
"rateLimit": "GitHub 요청 제한에 도달했습니다. 잠시 후 다시 시도하세요.",
"timeout": "검색 시간이 초과되었습니다. 다시 시도하세요.",
"invalidResponse": "GitHub 결과가 불완전하거나 읽을 수 없습니다. 다시 시도하세요."
+ },
+ "runtimeUnknown": "실행 중인 소스 버전을 정확히 확인할 수 없습니다(예: 로컬 변경이 있는 Dev 버전). 후보 PR을 확인용으로 유지합니다.",
+ "excludedIncluded": "실행 중인 버전에 포함된 PR {{count}}개를 제외했습니다.",
+ "limitedHint": "검색 결과의 일부만 확인했습니다. 요청을 구체화하면 검색 범위를 좁힐 수 있습니다.",
+ "runtimeVersion": "실행 중: {{channel}} {{version}} · {{commit}}",
+ "unknownCommit": "커밋 알 수 없음",
+ "draft": "초안",
+ "channel": {
+ "dev": "Dev",
+ "beta": "Beta",
+ "release": "정식 버전"
+ },
+ "inclusion": {
+ "included": "실행 중인 버전에 포함됨",
+ "notIncluded": "실행 중인 버전에 포함되지 않음",
+ "unknown": "실행 중인 버전의 포함 여부 미확인"
}
},
"title": "Cindy Make",
@@ -12575,8 +12597,10 @@
"cloning": "소스 다운로드 중",
"fetching": "저장소 새로 고침 중",
"checkingOut": "버전 전환 중",
- "preparingBranch": "개인 버전 브랜치 준비 중"
+ "preparingBranch": "개인 버전 브랜치 준비 중",
+ "installing": "의존성 설치 중"
},
+ "pending": "소스 준비 대기 중",
"ready": "소스가 준비되었습니다",
"failed": "소스 준비 실패",
"cancelled": "소스 준비가 중지됨",
@@ -12600,8 +12624,15 @@
"checkingOut": "파일 업데이트 중"
},
"missing": "아직 소스가 준비되지 않았습니다",
- "personalBranch": "개인 버전 브랜치 {{branch}}",
- "baseCommit": "{{ref}} {{commit}} 기준"
+ "details": {
+ "branch": "개인 버전 브랜치",
+ "baseRef": "{{ref}} 기준",
+ "baseCommit": "기준 버전",
+ "mainCommit": "main 버전",
+ "currentBranch": "프로젝트의 현재 브랜치",
+ "detached": "브랜치 없음 (고정 커밋)",
+ "unknown": "소스를 업데이트해 확인하세요"
+ }
},
"code": {
"starting": "개인 버전 작업을 여는 중",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
index 51e1652ce6..567d713b27 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -5652,6 +5652,16 @@
"permissionModeDisabled": "远程 IM 使用 Cindy 桌面端确认策略,因此该权限模式不可用。"
},
"cindyMake": {
+ "create": {
+ "title": "创建个人版本",
+ "cancel": "取消",
+ "description": "说说你想让 Cindy 做哪些改变。接下来会打开制作任务,使用统一流程检查环境、准备源码,再继续制作。",
+ "requestLabel": "你想做哪些改变?",
+ "requestHint": "最多 {{max}} 字。提交后可在任务中继续查看进度,离开设置页不会停止准备。",
+ "placeholder": "例如:在任务列表增加一个只看未完成任务的筛选按钮。",
+ "continue": "开始制作",
+ "failed": "未能开始制作,需求已保留,请重试。"
+ },
"title": "Cindy Make",
"openToolsDir": "打开工具目录",
"source": {
@@ -5662,10 +5672,6 @@
"update": "更新源码",
"preparingAction": "正在准备源码",
"path": "路径",
- "channel": "渠道",
- "version": "版本",
- "ref": "Ref",
- "commit": "Commit",
"status": {
"missing": "尚未准备个人版源码",
"pending": "正在准备源码",
@@ -5680,8 +5686,6 @@
"confirm": "清理源码",
"cancel": "取消"
},
- "branch": "个人版分支",
- "baseCommit": "基线",
"description": "Cindy 个人版的源码副本。制作个人版时会从个人版分支创建独立的开发目录,修改经测试后合并回来;这个目录本身不用来改代码。",
"stop": "停止"
},
@@ -12521,20 +12525,22 @@
"needRequest": "填写要修改的功能名称或具体报错,查询相关上游内容。",
"placeholder": "例如:修复消息流闪烁",
"search": "查询上游",
- "searching": "正在查询上游 Issue 和 PR…",
- "found": "找到可能相关的上游内容",
- "notFound": "没有找到匹配的上游内容",
+ "searching": "正在查询相关上游 PR…",
+ "found": "找到可能相关的 PR",
+ "notFound": "未找到其他匹配的 PR",
"failed": "上游查询失败",
"cancelled": "上游查询已停止",
"terms": "查询关键词:{{terms}}",
"author": "作者:{{author}}",
"updated": "更新于 {{date}}",
- "notFoundHint": "没有找到匹配这些关键词的公开 Issue 或 PR,换一种描述可能会有其他结果。",
- "resultHint": "请打开链接判断是否相关。这里只显示当前开放的 Issue 和 PR。",
+ "expand": "查看查询结果",
+ "collapse": "收起查询结果",
+ "notFoundHint": "本次关键词查询未发现其他候选,换一种描述可能会找到更多 PR。",
+ "resultHint": "包含未合并及已合并 PR,已确认包含在当前运行版本中的结果会被排除。请打开链接判断是否相关;已合并不等于已发布。",
"wait": "等待上游",
"personal": "继续制作个人版",
"retry": "重新检查并查询",
- "count": "找到 {{count}} 条可能相关的开放 Issue 或 PR",
+ "count": "{{count}} 个可能相关的 PR 待查看",
"kind": {
"issue": "Issue",
"pr": "PR"
@@ -12558,6 +12564,22 @@
"rateLimit": "GitHub 查询次数受限,请稍后重试。",
"timeout": "上游查询超时,请重试。",
"invalidResponse": "GitHub 返回的结果不完整或无法识别,请重试。"
+ },
+ "runtimeUnknown": "无法准确确认当前运行源码(例如有本地改动的 Dev 版),候选 PR 保留供判断。",
+ "excludedIncluded": "已排除当前运行版本包含的 {{count}} 个 PR。",
+ "limitedHint": "本次只核对了部分搜索结果,可细化需求以缩小范围。",
+ "runtimeVersion": "当前运行:{{channel}} {{version}} · {{commit}}",
+ "unknownCommit": "提交未知",
+ "draft": "草稿",
+ "channel": {
+ "dev": "Dev",
+ "beta": "Beta",
+ "release": "发布版"
+ },
+ "inclusion": {
+ "included": "当前运行版本已包含",
+ "notIncluded": "当前运行版本未包含",
+ "unknown": "是否包含尚未确认"
}
},
"title": "Cindy Make",
@@ -12571,8 +12593,10 @@
"cloning": "正在下载源码",
"fetching": "正在刷新仓库",
"checkingOut": "正在切换版本",
- "preparingBranch": "正在准备个人版分支"
+ "preparingBranch": "正在准备个人版分支",
+ "installing": "正在安装依赖"
},
+ "pending": "等待准备源码",
"ready": "源码已准备好",
"failed": "源码准备失败",
"cancelled": "源码准备已停止",
@@ -12596,8 +12620,15 @@
"checkingOut": "正在更新文件"
},
"missing": "尚未准备源码",
- "personalBranch": "个人版分支 {{branch}}",
- "baseCommit": "基于 {{ref}} {{commit}}"
+ "details": {
+ "branch": "个人版分支",
+ "baseRef": "基于 {{ref}}",
+ "baseCommit": "来源版本",
+ "mainCommit": "main 版本",
+ "currentBranch": "当前项目分支",
+ "detached": "未在分支上(固定提交)",
+ "unknown": "更新源码后查看"
+ }
},
"code": {
"starting": "正在打开个人版任务",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
index 3fe57b079a..efaec4a638 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -5652,6 +5652,16 @@
"permissionModeDisabled": "遠端 IM 使用 Cindy 桌面端確認策略,因此該權限模式不可用。"
},
"cindyMake": {
+ "create": {
+ "title": "建立個人版本",
+ "cancel": "取消",
+ "description": "說說你想讓 Cindy 做哪些改變。接下來會開啟製作任務,使用統一流程檢查環境、準備原始碼,再繼續製作。",
+ "requestLabel": "你想做哪些改變?",
+ "requestHint": "最多 {{max}} 字。提交後可在任務中繼續查看進度,離開設定頁不會停止準備。",
+ "placeholder": "例如:在任務清單增加一個只看未完成任務的篩選按鈕。",
+ "continue": "開始製作",
+ "failed": "無法開始製作,需求已保留,請重試。"
+ },
"title": "Cindy Make",
"openToolsDir": "打開工具目錄",
"source": {
@@ -5662,10 +5672,6 @@
"update": "更新原始碼",
"preparingAction": "正在準備原始碼",
"path": "路徑",
- "channel": "渠道",
- "version": "版本",
- "ref": "Ref",
- "commit": "Commit",
"status": {
"missing": "尚未準備個人版原始碼",
"pending": "正在準備原始碼",
@@ -5680,8 +5686,6 @@
"confirm": "清理原始碼",
"cancel": "取消"
},
- "branch": "個人版分支",
- "baseCommit": "基線",
"description": "Cindy 個人版的原始碼副本。製作個人版時會從個人版分支建立獨立的開發目錄,修改經測試後合併回來;這個目錄本身不用來改程式碼。",
"stop": "停止"
},
@@ -12521,20 +12525,22 @@
"needRequest": "填寫要修改的功能名稱或具體錯誤,查詢相關上游內容。",
"placeholder": "例如:修復訊息串流閃爍",
"search": "查詢上游",
- "searching": "正在查詢上游 Issue 和 PR…",
- "found": "找到可能相關的上游內容",
- "notFound": "沒有找到符合的上游內容",
+ "searching": "正在查詢相關上游 PR…",
+ "found": "找到可能相關的 PR",
+ "notFound": "未找到其他相符的 PR",
"failed": "上游查詢失敗",
"cancelled": "上游查詢已停止",
"terms": "查詢關鍵字:{{terms}}",
"author": "作者:{{author}}",
"updated": "更新於 {{date}}",
- "notFoundHint": "沒有找到符合這些關鍵字的公開 Issue 或 PR,換一種描述可能會有其他結果。",
- "resultHint": "請開啟連結判斷是否相關。這裡只顯示目前開放的 Issue 與 PR。",
+ "expand": "查看查詢結果",
+ "collapse": "收起查詢結果",
+ "notFoundHint": "本次關鍵字查詢未發現其他候選,換一種描述可能會找到更多 PR。",
+ "resultHint": "包含未合併及已合併 PR,已確認包含在目前執行版本中的結果會被排除。請開啟連結判斷是否相關;已合併不等於已發布。",
"wait": "等待上游",
"personal": "繼續製作個人版",
"retry": "重新檢查並查詢",
- "count": "找到 {{count}} 筆可能相關的開放 Issue 或 PR",
+ "count": "{{count}} 個可能相關的 PR 待查看",
"kind": {
"issue": "Issue",
"pr": "PR"
@@ -12558,6 +12564,22 @@
"rateLimit": "GitHub 查詢次數受限,請稍後重試。",
"timeout": "上游查詢逾時,請重試。",
"invalidResponse": "GitHub 回傳的結果不完整或無法識別,請重試。"
+ },
+ "runtimeUnknown": "無法準確確認目前執行的原始碼(例如有本機修改的 Dev 版),候選 PR 保留供判斷。",
+ "excludedIncluded": "已排除目前執行版本包含的 {{count}} 個 PR。",
+ "limitedHint": "本次只核對了部分搜尋結果,可細化需求以縮小範圍。",
+ "runtimeVersion": "目前執行:{{channel}} {{version}} · {{commit}}",
+ "unknownCommit": "提交未知",
+ "draft": "草稿",
+ "channel": {
+ "dev": "Dev",
+ "beta": "Beta",
+ "release": "發布版"
+ },
+ "inclusion": {
+ "included": "目前執行版本已包含",
+ "notIncluded": "目前執行版本未包含",
+ "unknown": "是否包含尚未確認"
}
},
"title": "Cindy Make",
@@ -12571,8 +12593,10 @@
"cloning": "正在下載原始碼",
"fetching": "正在更新儲存庫",
"checkingOut": "正在切換版本",
- "preparingBranch": "正在準備個人版分支"
+ "preparingBranch": "正在準備個人版分支",
+ "installing": "正在安裝相依套件"
},
+ "pending": "等待準備原始碼",
"ready": "原始碼已準備好",
"failed": "原始碼準備失敗",
"cancelled": "原始碼準備已停止",
@@ -12596,8 +12620,15 @@
"checkingOut": "正在更新檔案"
},
"missing": "尚未準備原始碼",
- "personalBranch": "個人版分支 {{branch}}",
- "baseCommit": "基於 {{ref}} {{commit}}"
+ "details": {
+ "branch": "個人版分支",
+ "baseRef": "基於 {{ref}}",
+ "baseCommit": "來源版本",
+ "mainCommit": "main 版本",
+ "currentBranch": "目前專案分支",
+ "detached": "不在分支上(固定提交)",
+ "unknown": "更新原始碼後查看"
+ }
},
"code": {
"starting": "正在開啟個人版任務",
diff --git a/apps/desktop/src/renderer/lib/__tests__/cindyMakeCommand.test.ts b/apps/desktop/src/renderer/lib/__tests__/cindyMakeCommand.test.ts
index a00feca781..a11b3d55e0 100644
--- a/apps/desktop/src/renderer/lib/__tests__/cindyMakeCommand.test.ts
+++ b/apps/desktop/src/renderer/lib/__tests__/cindyMakeCommand.test.ts
@@ -161,16 +161,11 @@ describe('native environment-check entry', () => {
expect(h.ensureTask).toHaveBeenCalledWith(
expect.objectContaining({ sessionId: 'source-task' }),
);
- expect(h.start).toHaveBeenCalledExactlyOnceWith(
- 'source-task',
- invocation,
- undefined,
- { modalOnly: true },
- );
+ expect(h.start).toHaveBeenCalledExactlyOnceWith('source-task', invocation);
},
);
- it('passes home preferences only to task creation and returns its modal target', async () => {
+ it('passes home preferences only to task creation and starts a persistent timeline card', async () => {
h.ensureTask.mockResolvedValue('home-task');
const createOptions = {
workspaceKind: 'dialogue',
@@ -192,12 +187,10 @@ describe('native environment-check entry', () => {
title: 'fix scrolling',
isCurrent: expect.any(Function),
});
- expect(h.start).toHaveBeenCalledWith(
- 'home-task',
- { command: 'cindy-make', request: 'fix scrolling' },
- undefined,
- { modalOnly: true },
- );
+ expect(h.start).toHaveBeenCalledWith('home-task', {
+ command: 'cindy-make',
+ request: 'fix scrolling',
+ });
});
it.each(['cindy-make', 'cindy-make-doctor'])(
diff --git a/apps/desktop/src/renderer/lib/__tests__/cindyMakeDoctor.test.ts b/apps/desktop/src/renderer/lib/__tests__/cindyMakeDoctor.test.ts
index 8fa2f1dbdd..12142647fd 100644
--- a/apps/desktop/src/renderer/lib/__tests__/cindyMakeDoctor.test.ts
+++ b/apps/desktop/src/renderer/lib/__tests__/cindyMakeDoctor.test.ts
@@ -1,7 +1,11 @@
import { afterEach, describe, expect, it, vi } from 'vitest';
import { startMakeDoctor } from '../cindyMakeDoctor';
import { setDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';
-import { MAKE_DOCTOR_CHECK_IDS, type MakeDoctorReport } from '../../../shared/cindyMakeDoctor';
+import {
+ MAKE_DOCTOR_CHECK_IDS,
+ type CindyMakeGlobalState,
+ type MakeDoctorReport,
+} from '../../../shared/cindyMakeDoctor';
const done = (runId: string): MakeDoctorReport => ({
runId,
@@ -19,6 +23,80 @@ afterEach(() => {
});
describe('Main-owned progress in the doctor card', () => {
+ it.each(['change A', ''])(
+ 'isolates workflow progress from unrelated global environment reports (%j)',
+ async (request) => {
+ type Api = NonNullable<Parameters<typeof startMakeDoctor>[1]>;
+ const commandListeners = new Set<Parameters<Api['onDesktopCommandTriggered']>[0]>();
+ const stateListeners = new Set<(state: CindyMakeGlobalState) => void>();
+ const completions = new Map<
+ string,
+ (result: { success: boolean; doctorReport: MakeDoctorReport }) => void
+ >();
+ const onCindyMakeState = vi.fn((listener: (state: CindyMakeGlobalState) => void) => {
+ stateListeners.add(listener);
+ return () => {
+ stateListeners.delete(listener);
+ };
+ });
+ const api: Api = {
+ onCindyMakeState,
+ onDesktopCommandTriggered: (listener) => {
+ commandListeners.add(listener);
+ return () => {
+ commandListeners.delete(listener);
+ };
+ },
+ executeDesktopCommand: (_command, ctx) =>
+ new Promise((resolve) => {
+ completions.set(ctx!.doctorRunId!, resolve);
+ }),
+ };
+ const firstRun = startMakeDoctor(onReport, api, 'cindy-make', { request });
+ const secondRun = startMakeDoctor(onReport, api, 'cindy-make', { request: 'change B' });
+ const firstProgress: MakeDoctorReport = {
+ ...done(firstRun),
+ mode: 'prepare',
+ status: 'running',
+ source: { status: 'ready', path: 'managed-source' },
+ upstream: { status: 'searching', items: [] },
+ };
+ for (const listener of commandListeners)
+ listener({ command: 'cindy-make', doctorReport: firstProgress });
+ for (const listener of stateListeners)
+ listener({
+ environmentPrepare: {
+ active: true,
+ report: { ...done(secondRun), mode: 'prepare' },
+ },
+ });
+ expect(getMakeDoctorReport(firstRun)).toEqual(firstProgress);
+ expect(getMakeDoctorReport(secondRun)).toMatchObject({
+ status: 'running',
+ upstream: { status: 'pending' },
+ });
+ expect(onCindyMakeState).not.toHaveBeenCalled();
+ completions.get(firstRun)!({
+ success: true,
+ doctorReport: {
+ ...firstProgress,
+ status: 'completed',
+ upstream: { status: 'found', items: [] },
+ },
+ });
+ completions.get(secondRun)!({
+ success: true,
+ doctorReport: { ...done(secondRun), mode: 'prepare' },
+ });
+ await vi.waitFor(() => expect(commandListeners.size).toBe(0));
+ expect(getMakeDoctorReport(firstRun)).toMatchObject({
+ status: 'completed',
+ source: { status: 'ready' },
+ upstream: { status: 'found' },
+ });
+ },
+ );
+
it('subscribes before starting, isolates run ids, and reconciles from the invoke result', async () => {
let listener:
((event: { command: string; doctorReport: MakeDoctorReport }) => void) | undefined;
diff --git a/apps/desktop/src/renderer/lib/__tests__/cindyMakeDoctorStream.test.ts b/apps/desktop/src/renderer/lib/__tests__/cindyMakeDoctorStream.test.ts
index b4861d5afe..f104a6a7b2 100644
--- a/apps/desktop/src/renderer/lib/__tests__/cindyMakeDoctorStream.test.ts
+++ b/apps/desktop/src/renderer/lib/__tests__/cindyMakeDoctorStream.test.ts
@@ -59,6 +59,7 @@ vi.mock('@/lib/makerTransport', () => ({
import { buildCreateOptsForCurrentSession, makerChatStore } from '@/lib/makerChatStore';
import * as messageService from '@/lib/messageService';
+import { tryStartCindyMakeCommand } from '../cindyMakeCommand';
import {
chooseMakeUpstream,
ensureMakeTask,
@@ -182,6 +183,45 @@ afterEach(async () => {
});
describe('doctor cards in the message stream', () => {
+ it.each(['home', 'existing-task'])(
+ 'persists the native Make command from %s as a visible card without starting an Agent',
+ async (entry) => {
+ const sessionId = sid();
+ const created = { id: sessionId, agentKind: 'codex', title: 'fix scrolling' };
+ h.create.mockResolvedValue(created);
+ h.update.mockResolvedValue(created);
+ const result = await tryStartCindyMakeCommand({
+ text: '/cindy-make fix scrolling',
+ commands: [{ name: 'cindy-make', kind: 'desktop', description: 'Make' }],
+ sessionId: entry === 'home' ? undefined : sessionId,
+ deviceId: null,
+ hasUnsupportedContent: false,
+ isCurrent: () => true,
+ createOptions: { workspaceKind: 'dialogue', agentKind: 'codex' },
+ });
+ expect(result).toEqual({ kind: 'started', sessionId });
+ const card = messages(sessionId)[0];
+ expect(card.systemCardType).toBe('cindy-make');
+ expect(card.systemCardData?.request).toBe('fix scrolling');
+ expect(card.systemCardData?.modalOnly).toBeUndefined();
+ await vi.waitFor(() => expect(messageService.create).toHaveBeenCalledOnce());
+ expect(messageService.create).toHaveBeenCalledWith(
+ sessionId,
+ expect.objectContaining({
+ content: {
+ __cindyMakeCard: {
+ type: 'cindy-make',
+ data: expect.objectContaining({ request: 'fix scrolling' }),
+ },
+ },
+ }),
+ );
+ expect(h.create).toHaveBeenCalledTimes(entry === 'home' ? 1 : 0);
+ expect(makerChatStore.sendMessage).not.toHaveBeenCalled();
+ expect(h.prepareWorkspace).not.toHaveBeenCalled();
+ },
+ );
+
it('restores a persisted Make card from the task history', () => {
const [restored] = makerChatStore.__mapServerMessagesForTest([
{
@@ -486,6 +526,30 @@ describe('doctor task placement', () => {
expect(id).toBe(created.id);
});
+ it.each(['success', 'failure'])(
+ 'does not publish an old-account task after title update %s',
+ async (outcome) => {
+ const created = { id: sid(), ...createOptions };
+ const pending = deferred<void>();
+ h.create.mockResolvedValue(created);
+ h.update.mockImplementation(async () => {
+ await pending.promise;
+ if (outcome === 'failure') throw new Error('title update failed');
+ return { ...created, title: 'fix scrolling' };
+ });
+ const result = ensureMakeTask({
+ createOptions,
+ title: 'fix scrolling',
+ isCurrent: () => true,
+ });
+ await vi.waitFor(() => expect(h.update).toHaveBeenCalledTimes(1));
+ setDataOwnerGeneration('different-owner');
+ pending.resolve();
+ expect(await result).toBeNull();
+ expect(h.prepend).not.toHaveBeenCalled();
+ },
+ );
+
it('creates a code task in the prepared source directory and sends the original request', async () => {
const origin = sid();
const sourcePath = 'C:\\cindy-make\\source';
diff --git a/apps/desktop/src/renderer/lib/cindyMakeCommand.ts b/apps/desktop/src/renderer/lib/cindyMakeCommand.ts
index 9e453e3de8..221dce4b56 100644
--- a/apps/desktop/src/renderer/lib/cindyMakeCommand.ts
+++ b/apps/desktop/src/renderer/lib/cindyMakeCommand.ts
@@ -121,7 +121,7 @@ export async function tryStartCindyMakeCommand(
isCurrent,
});
if (!sessionId || !isCurrent()) return { kind: 'stale' };
- return startMakeDoctorInStream(sessionId, match.invocation, undefined, { modalOnly: true })
+ return startMakeDoctorInStream(sessionId, match.invocation)
? { kind: 'started', sessionId }
: { kind: 'failed' };
} catch {
diff --git a/apps/desktop/src/renderer/lib/cindyMakeDoctor.ts b/apps/desktop/src/renderer/lib/cindyMakeDoctor.ts
index 31777b6677..b7cf4d6500 100644
--- a/apps/desktop/src/renderer/lib/cindyMakeDoctor.ts
+++ b/apps/desktop/src/renderer/lib/cindyMakeDoctor.ts
@@ -2,7 +2,7 @@ import {
getDataOwnerGeneration,
isDataOwnerGenerationCurrent,
} from '@/contexts/dataOwnerGeneration';
-import type { MakeDoctorReport } from '../../shared/cindyMakeDoctor';
+import type { CindyMakeGlobalState, MakeDoctorReport } from '../../shared/cindyMakeDoctor';
import { MAKE_DOCTOR_CHECK_IDS } from '../../shared/cindyMakeDoctor';
import { extractIpcError } from '@/utils/ipcError';
import { isCindyMakeForceManagedToolsEnabled } from './cindyMakeSettings';
@@ -10,7 +10,9 @@ import { isCindyMakeForceManagedToolsEnabled } from './cindyMakeSettings';
type DoctorApi = Pick<
Window['electronAPI']['maker'],
'executeDesktopCommand' | 'onDesktopCommandTriggered'
->;
+> & {
+ onCindyMakeState?: (listener: (state: CindyMakeGlobalState) => void) => () => void;
+};
/** Runs Main-owned diagnostics; the caller owns their placement in chat or Settings. */
export function startMakeDoctor(
onReport: (report: MakeDoctorReport) => void,
@@ -26,6 +28,7 @@ export function startMakeDoctor(
const owner = getDataOwnerGeneration();
const runId = crypto.randomUUID();
const forceManagedTools = options.forceManagedTools ?? isCindyMakeForceManagedToolsEnabled();
+ const workflow = command === 'cindy-make' && options.request !== undefined && !options.makeAction;
let latest: MakeDoctorReport = {
runId,
platform: '',
@@ -50,18 +53,11 @@ export function startMakeDoctor(
publish({ ...report, mode: latest.mode });
};
let unsubscribe = () => {};
+ let unsubscribeState = () => {};
let pending = false;
const abort = () => {
unsubscribe();
- if (pending)
- void api
- .executeDesktopCommand(command, {
- doctorRunId: runId,
- doctorAction: 'cancel',
- })
- .catch(() => {
- /* View teardown must not leave an unhandled rejection. */
- });
+ unsubscribeState();
};
const fail = (error?: unknown) => {
if (options.signal?.aborted || !isDataOwnerGenerationCurrent(owner)) return;
@@ -108,6 +104,29 @@ export function startMakeDoctor(
unsubscribe = api.onDesktopCommandTriggered((event) => {
if (event.command === command) accept(event.doctorReport);
});
+ const stateKey = options.makeAction
+ ? options.makeAction === 'prepare-source'
+ ? 'sourcePrepare'
+ : 'sourceClear'
+ : command === 'cindy-make-doctor'
+ ? 'environmentCheck'
+ : 'environmentPrepare';
+ const stateSubscriber =
+ api.onCindyMakeState ??
+ (typeof window !== 'undefined'
+ ? (window.electronAPI as typeof window.electronAPI & DoctorApi).onCindyMakeState
+ : undefined);
+ if (!workflow) {
+ unsubscribeState =
+ stateSubscriber?.((state) => {
+ const snapshot = state[stateKey];
+ if (!snapshot?.active) return;
+ const report = snapshot.report;
+ const matchesMode = report.mode === latest.mode;
+ const matchesForce = (report.forceManagedTools === true) === (forceManagedTools === true);
+ if (matchesMode && matchesForce) accept({ ...report, runId });
+ }) ?? (() => {});
+ }
pending = true;
options.signal?.addEventListener('abort', abort, { once: true });
void api
@@ -126,11 +145,13 @@ export function startMakeDoctor(
pending = false;
options.signal?.removeEventListener('abort', abort);
unsubscribe();
+ unsubscribeState();
});
} catch {
pending = false;
options.signal?.removeEventListener('abort', abort);
unsubscribe();
+ unsubscribeState();
fail();
}
return runId;
diff --git a/apps/desktop/src/renderer/lib/cindyMakeDoctorStream.ts b/apps/desktop/src/renderer/lib/cindyMakeDoctorStream.ts
index aea70d2ef7..0b3045dd7a 100644
--- a/apps/desktop/src/renderer/lib/cindyMakeDoctorStream.ts
+++ b/apps/desktop/src/renderer/lib/cindyMakeDoctorStream.ts
@@ -136,6 +136,7 @@ export async function ensureMakeTask(input: {
// The task still exists if the best-effort title write loses a race.
}
}
+ if (!isDataOwnerGenerationCurrent(owner)) return null;
sessionsStore.prependCreated(session);
return input.isCurrent() ? session.id : null;
}
diff --git a/apps/desktop/src/renderer/vite-env.d.ts b/apps/desktop/src/renderer/vite-env.d.ts
index 4bd64a6361..f0aae9eb43 100644
--- a/apps/desktop/src/renderer/vite-env.d.ts
+++ b/apps/desktop/src/renderer/vite-env.d.ts
@@ -2994,7 +2994,11 @@ interface ElectronAPI {
/** Open Cindy's managed Make tools directory (`<userData>/cindy-make/tools`). */
openCindyMakeToolsDir: () => Promise<{ success: boolean }>;
getCindyMakeSourceStatus: () => Promise<import('../shared/cindyMakeDoctor').MakeSourceStatus>;
+ getCindyMakeState: () => Promise<import('../shared/cindyMakeDoctor').CindyMakeGlobalState>;
openCindyMakeSourceDir: () => Promise<{ success: boolean }>;
+ onCindyMakeState: (
+ listener: (state: import('../shared/cindyMakeDoctor').CindyMakeGlobalState) => void,
+ ) => () => void;
/** Live global source status (Settings and the workflow share one operation). */
onCindyMakeSourceStatus: (
listener: (status: import('../shared/cindyMakeDoctor').MakeSourceStatus) => void,
diff --git a/apps/desktop/src/shared/cindyMakeDoctor.ts b/apps/desktop/src/shared/cindyMakeDoctor.ts
index f70f68aaa0..cdb84507a9 100644
--- a/apps/desktop/src/shared/cindyMakeDoctor.ts
+++ b/apps/desktop/src/shared/cindyMakeDoctor.ts
@@ -57,6 +57,19 @@ export interface MakeDoctorReport {
source?: MakeSourcePreparation;
}
+/** Main-owned snapshots for all Cindy Make resources. Renderer only subscribes. */
+export interface CindyMakeOperationSnapshot {
+ active: boolean;
+ report: MakeDoctorReport;
+}
+
+export interface CindyMakeGlobalState {
+ environmentCheck?: CindyMakeOperationSnapshot;
+ environmentPrepare?: CindyMakeOperationSnapshot;
+ sourcePrepare?: CindyMakeOperationSnapshot;
+ sourceClear?: CindyMakeOperationSnapshot;
+}
+
export interface MakeSourcePreparation {
status: 'pending' | 'preparing' | 'missing' | 'ready' | 'failed' | 'cancelled';
path: string;
@@ -68,8 +81,13 @@ export interface MakeSourcePreparation {
commit?: string;
/** Local branch holding the user's verified personal changes; every task branches from it. */
branch?: string;
+ currentBranch?: string | null;
/** Commit of the upstream baseline ref the personal branch was created from or last updated to. */
baseCommit?: string;
+ mainCommit?: string;
+ mainRemoteCommit?: string;
+ mainBehind?: number;
+ mainAhead?: number;
error?:
| 'unsupportedVersion'
| 'tagNotFound'
@@ -81,7 +99,7 @@ export interface MakeSourcePreparation {
| 'installFailed'
| 'locked'
| 'cancelled';
- phase?: 'checking' | 'cloning' | 'fetching' | 'checkingOut' | 'preparingBranch';
+ phase?: 'checking' | 'cloning' | 'fetching' | 'checkingOut' | 'preparingBranch' | 'installing';
progress?: MakeSourceGitProgress;
}
@@ -97,6 +115,8 @@ export interface MakeTaskWorkspace {
export interface MakeSourceGitProgress {
stage: 'counting' | 'compressing' | 'receiving' | 'resolving' | 'checkingOut';
percent: number;
+ /** Latest sanitized Git progress line for user-visible activity feedback. */
+ message?: string;
}
/** Persisted summary of the managed Cindy source checkout. */
@@ -108,7 +128,12 @@ export interface MakeSourceStatus {
ref?: string;
commit?: string;
branch?: string;
+ currentBranch?: string | null;
baseCommit?: string;
+ mainCommit?: string;
+ mainRemoteCommit?: string;
+ mainBehind?: number;
+ mainAhead?: number;
error?: MakeSourcePreparation['error'];
phase?: MakeSourcePreparation['phase'];
progress?: MakeSourceGitProgress;
@@ -117,18 +142,32 @@ export interface MakeSourceStatus {
export interface MakeUpstreamItem {
number: number;
title: string;
- state: 'open';
+ state: 'open' | 'merged' | 'closed' | 'unknown';
kind: 'issue' | 'pr';
htmlUrl: string;
author?: string;
updatedAt?: string;
summary?: string;
+ inclusion?: MakeUpstreamInclusion;
+ draft?: boolean;
+}
+
+export type MakeUpstreamInclusion = 'included' | 'notIncluded' | 'unknown';
+
+export interface MakeRuntimeVersion {
+ channel: 'dev' | 'beta' | 'release';
+ version: string;
+ commit?: string;
+ confidence: 'exact' | 'unknown';
}
export interface MakeUpstreamQuery {
status: 'pending' | 'needsRequest' | 'searching' | 'notFound' | 'found' | 'failed' | 'cancelled';
items: MakeUpstreamItem[];
terms?: string[];
+ runtime?: MakeRuntimeVersion;
+ excludedIncluded?: number;
+ hasMore?: boolean;
failure?: 'network' | 'rateLimit' | 'timeout' | 'invalidResponse';
}
diff --git a/apps/desktop/vite.main.config.ts b/apps/desktop/vite.main.config.ts
index 9e2b351041..80ed469019 100644
--- a/apps/desktop/vite.main.config.ts
+++ b/apps/desktop/vite.main.config.ts
@@ -2,6 +2,7 @@ import path from 'node:path';
import { fileURLToPath } from 'node:url';
import { defineConfig, loadEnv } from 'vite';
import { desktopClientBuildEnv } from '../../scripts/shared/client-endpoint-build-env.mjs';
+import { cindyRuntimeSourcePlugin } from './cindy-runtime-source';
const configDir = path.dirname(fileURLToPath(import.meta.url));
// 登录 scenario fixtures 的生产空 stub(implementation-plan Step 0 WHAT4 生产排除
@@ -33,6 +34,7 @@ export default defineConfig(({ mode }) => {
? (process.env[key] ?? '')
: (allEnv[key] ?? '');
return {
+ plugins: [cindyRuntimeSourcePlugin(path.resolve(configDir, '../..'), mode === 'development')],
resolve: {
// 仅 fixtures 生产排除条件(v6.17 允许范围):production 构建把
// '@cindy/auth-client/fixtures' 整模块替换为空 stub,dev 构建保留真模块。
diff --git a/docs/cindy-make-upstream.md b/docs/cindy-make-upstream.md
new file mode 100644
index 0000000000..9c48f7427d
--- /dev/null
+++ b/docs/cindy-make-upstream.md
@@ -0,0 +1,39 @@
+# Cindy Make 上游 PR 查询
+
+查询目标是与用户需求相关、但当前运行的 Cindy 尚未确认包含的 PR,不是全部 Issue,
+也不是仅查询未合并或未发布内容。关键词命中只表示可能相关,不保证满足需求。
+
+## 运行版本基准
+
+- Main 构建时将源码 commit 和工作区是否干净注入 bundle;不新增运行期 Git 缓存 JSON。
+- 发布包和 Beta 使用正在执行的 bundle 的身份,版本号仅展示渠道,不拿最新 release、
+ 可移动的 tag、准备好的源码目录或 `origin/main` 替代运行 commit。
+- Dev 同样固定在该次 Main 构建的 commit;查询时检查构建源目录是否仍然干净、HEAD
+ 是否一致。它只用于检测失效,不会把新的 HEAD 当成正在运行的版本。
+- Main watch 重编译会重新采集身份。Renderer 单独热更新、未提交改动、查询中切分支、
+ 缺少构建身份或 Git 检查失败时,保守保留候选并显示“是否包含尚未确认”。
+- 发布构建临时改写 `package.json` 的版本号不算源码改动;除此之外的改动不豁免。
+
+## 查询与包含判断
+
+1. 对最多三个关键词分别查询开放 PR 和已合并 PR;Issue 不参与,也不按发布时间过滤。
+2. 读取 PR 详情:已合并时使用合并后的 commit(包括 squash/rebase 结果),未合并时
+ 使用 PR head,不能使用 GitHub 为测试合并生成的 commit。已关闭且未合并的 PR 排除。
+3. 优先使用 Dev 的本地 Git 对固定 commit 做只读祖先判断;否则使用 GitHub compare。
+ 已确认包含的 PR 被排除。确认在当前 commit 之后的 PR 标记“当前运行版本未包含”。
+4. 分叉历史、无法证明等价的 cherry-pick、已知 revert、GitHub 不可比较、历史被截断、
+ 脏构建等情况保持未知,不将“查不到”当成“没有”,也不把未知候选静默移除。
+5. 当前运行的是未合并 PR 分支时,也能通过 head 包含关系排除该 PR。
+
+每个关键词/状态最多取十个结果,去重排序后最多核对二十个 PR,最多显示五个。
+排除已包含结果后继续补充候选;未核对完时明确显示部分结果提示。查询总超时为 25 秒,
+取消/超时不会误报“没有匹配”。详情或比较失败时保留对应候选,包含状态标记未知。
+
+“已合并”不表示“已发布”,也不表示用户当前版本已包含。本查询不核实发布渠道、平台
+或可更新版本,因此不会凭 PR 状态声称“升级即可获得”或“尚未发布”。
+
+## 不变的边界
+
+保持既有全局后台流程、源码准备和用户主动选择;不切分支、不合并 PR、不升级客户端。
+历史消息中的 Issue 结果与缺少新字段的记录继续可读,新查询只产生 PR。
+Main 负责网络和 Git,UI 只消费报告;运行版本摘要在结果详情内,主流程保持紧凑。
diff --git a/docs/design-rules/design-inventory.md b/docs/design-rules/design-inventory.md
index b450a63346..0d5564a648 100644
--- a/docs/design-rules/design-inventory.md
+++ b/docs/design-rules/design-inventory.md
@@ -9,7 +9,7 @@
本区块由 `scripts/design-inventory.mjs` 生成,请勿手改。
重新生成:`pnpm design:inventory`;校验:`pnpm check:design-inventory`。
-计数快照日期:2026-09-14。生成命令:`pnpm design:inventory`。裸颜色匹配与 `scripts/hardcoded-color-audit.mjs` 共用 `scripts/shared/hardcoded-color-match.mjs`(HEX / RGB / HSL / OKLCH 等字面通道),两者在共享 matcher 内统一排除纯语义包装、注释及 PR 编号;数值颜色函数还需位于样式属性、CSS 声明/函数或任意值语境,普通文案字符串里的颜色函数文本不计入;字面 fallback 仍计入——语义 token 消费与注释引用不是迁移债务;裸圆角为粗粒度(`rounded*` class、`border-radius:` 与 React style 对象的 `borderRadius:`)。Token 计数为样式源里 `var(--token)` / `hsl(var(--token)` 的去重 ID 数;Mobile 的 ThemeColors / typeScale 等 RN 属性不计入此列,不能将 0 解释为未使用 Token。
+计数快照日期:2026-09-15。生成命令:`pnpm design:inventory`。裸颜色匹配与 `scripts/hardcoded-color-audit.mjs` 共用 `scripts/shared/hardcoded-color-match.mjs`(HEX / RGB / HSL / OKLCH 等字面通道),两者在共享 matcher 内统一排除纯语义包装、注释及 PR 编号;数值颜色函数还需位于样式属性、CSS 声明/函数或任意值语境,普通文案字符串里的颜色函数文本不计入;字面 fallback 仍计入——语义 token 消费与注释引用不是迁移债务;裸圆角为粗粒度(`rounded*` class、`border-radius:` 与 React style 对象的 `borderRadius:`)。Token 计数为样式源里 `var(--token)` / `hsl(var(--token)` 的去重 ID 数;Mobile 的 ThemeColors / typeScale 等 RN 属性不计入此列,不能将 0 解释为未使用 Token。
登记 surface 数:50。平台包含 Desktop 与 Mobile;静态入口发现不表示已迁移或已实机验证。
@@ -18,12 +18,12 @@
| `desktop.auth.add-account` | desktop | 添加账号 | hash `/add-account`(ProtectedRoute → AddAccountLoginPage) | AddAccountLoginPage | apps/desktop/src/renderer/components/login/AddAccountLoginPage.tsx, apps/desktop/src/renderer/components/login/LoginBrandStage.tsx, apps/desktop/src/renderer/components/login/LoginCaptchaOverlay.tsx, apps/desktop/src/renderer/components/login/LoginControls.tsx, apps/desktop/src/renderer/components/login/LoginPage.tsx, apps/desktop/src/renderer/components/login/loginDesignTokens.ts | 59 | 0 | 21 |
| `desktop.auth.legacy-migration` | desktop | 首登数据迁移弹窗 | App 顶层挂载 LegacyMigrationDialog(仅主窗;main 检测到旧版 userData 经 `legacy-migration:state` 驱动) | LegacyMigrationDialog | apps/desktop/src/renderer/components/auth/LegacyMigrationDialog.tsx | 8 | 0 | 2 |
| `desktop.auth.login` | desktop | 登录页 | hash `/login`(GuestRoute → LoginPage) | LoginBrandStage, LoginCaptchaOverlay, LoginControls, LoginPage | apps/desktop/src/renderer/components/login/LoginBrandStage.tsx, apps/desktop/src/renderer/components/login/LoginCaptchaOverlay.tsx, apps/desktop/src/renderer/components/login/LoginControls.tsx, apps/desktop/src/renderer/components/login/LoginPage.tsx, apps/desktop/src/renderer/components/login/loginDesignTokens.ts | 59 | 0 | 21 |
-| `desktop.bots` | desktop | 伙伴(列表 / 对话 / 设置 / 历史 / 伙伴私聊) | hash `/bots`、`/bots/:botId`、`/bots/roster` 及伙伴当前/历史任务、伙伴私聊路由(BotsFeatureLayout) | BotBasicProfileFields, BotCollaborationCard, BotDirectMessageView, BotHistorySessionView, BotLifecycleSettings, BotModelChainEditor, BotRosterView, BotSessionView, BotSettingsDrawer, BotsHomeView, RemoteBotSessionView | apps/desktop/src/renderer/components/chat/AgentActionRow.tsx, apps/desktop/src/renderer/components/chat/AgentActionsBlock.tsx, apps/desktop/src/renderer/components/chat/AgentTaskCard.tsx, apps/desktop/src/renderer/components/chat/AskUserQuestionBubble.tsx, apps/desktop/src/renderer/components/chat/AssistantMessage.tsx, apps/desktop/src/renderer/components/chat/AutomationOriginBadge.tsx, apps/desktop/src/renderer/components/chat/ChatAudioCard.tsx, apps/desktop/src/renderer/components/chat/ChatDisplaySnapshotContext.tsx, apps/desktop/src/renderer/components/chat/ChatImageView.tsx, apps/desktop/src/renderer/components/chat/ChatSessionFileContext.tsx, apps/desktop/src/renderer/components/chat/ChatSoundEffectCard.tsx, apps/desktop/src/renderer/components/chat/ChatVideoView.tsx, apps/desktop/src/renderer/components/chat/CindyMakeCommandDialog.tsx, apps/desktop/src/renderer/components/chat/CindyMakeDoctorCard.tsx, apps/desktop/src/renderer/components/chat/CopyAsImageBlock.tsx, apps/desktop/src/renderer/components/chat/CredentialSwitchWaitBanner.tsx, apps/desktop/src/renderer/components/chat/DiffView.tsx, apps/desktop/src/renderer/components/chat/ErrorBanner.tsx, apps/desktop/src/renderer/components/chat/ErrorMessageCard.tsx, apps/desktop/src/renderer/components/chat/GeneratedFilesCard.tsx, apps/desktop/src/renderer/components/chat/GhostSummonCard.tsx, apps/desktop/src/renderer/components/chat/GhostToolCard.tsx, apps/desktop/src/renderer/components/chat/HookTaskCard.tsx, apps/desktop/src/renderer/components/chat/ImageGalleryContext.tsx, apps/desktop/src/renderer/components/chat/ImageHoverPreview.tsx, apps/desktop/src/renderer/components/chat/ImageLightbox.tsx, apps/desktop/src/renderer/components/chat/ImageMissingPlaceholder.tsx, apps/desktop/src/renderer/components/chat/InlineReferenceChip.tsx, apps/desktop/src/renderer/components/chat/InterruptedTurnBanner.tsx, apps/desktop/src/renderer/components/chat/JumpToBottomChip.tsx, apps/desktop/src/renderer/components/chat/MarkdownDiffBlock.tsx, apps/desktop/src/renderer/components/chat/MarkdownMermaidBlock.tsx, apps/desktop/src/renderer/components/chat/MarkdownRenderer.tsx, apps/desktop/src/renderer/components/chat/MermaidLightbox.tsx, apps/desktop/src/renderer/components/chat/MessageActionBar.tsx, apps/desktop/src/renderer/components/chat/MessageNavRail.tsx, apps/desktop/src/renderer/components/chat/MessageStream.tsx, apps/desktop/src/renderer/components/chat/ModelLightbox.tsx, apps/desktop/src/renderer/components/chat/NewMessageIndicator.tsx, apps/desktop/src/renderer/components/chat/PlanReviewBubble.tsx, apps/desktop/src/renderer/components/chat/PrevMessageJumpChip.tsx, apps/desktop/src/renderer/components/chat/ProjectLinkChip.tsx, apps/desktop/src/renderer/components/chat/QuoteChip.tsx, apps/desktop/src/renderer/components/chat/RewindPreviewDialog.tsx, apps/desktop/src/renderer/components/chat/SelectionQuoteButton.tsx, apps/desktop/src/renderer/components/chat/SentAgentReferenceChip.tsx, apps/desktop/src/renderer/components/chat/SentInlineAtomBody.tsx, apps/desktop/src/renderer/components/chat/SessionHandoffCard.tsx, apps/desktop/src/renderer/components/chat/SessionLinkChip.tsx, apps/desktop/src/renderer/components/chat/ShareMessageCheckbox.tsx, apps/desktop/src/renderer/components/chat/ShareSelectionBar.tsx, apps/desktop/src/renderer/components/chat/SlackIcon.tsx, apps/desktop/src/renderer/components/chat/StreamFadeSpan.tsx, apps/desktop/src/renderer/components/chat/StreamingMarkdownChunk.tsx, apps/desktop/src/renderer/components/chat/SystemCard.tsx, apps/desktop/src/renderer/components/chat/TextLightbox.tsx, apps/desktop/src/renderer/components/chat/ThinkingCard.tsx, apps/desktop/src/renderer/components/chat/ThinkingText.tsx, apps/desktop/src/renderer/components/chat/TodoListCard.tsx, apps/desktop/src/renderer/components/chat/ToolCallCard.tsx, apps/desktop/src/renderer/components/chat/ToolPayloadLightbox.tsx, apps/desktop/src/renderer/components/chat/TopRightChipStack.tsx, apps/desktop/src/renderer/components/chat/TurnChangesCard.tsx, apps/desktop/src/renderer/components/chat/UnreadFailedScheduleBanner.tsx, apps/desktop/src/renderer/components/chat/UpgradeBanner.tsx, apps/desktop/src/renderer/components/chat/UserMessage.tsx, apps/desktop/src/renderer/components/chat/UserMessageEditBox.tsx, apps/desktop/src/renderer/components/chat/UserMessageUrlLink.tsx, apps/desktop/src/renderer/components/chat/VideoLightbox.tsx, apps/desktop/src/renderer/components/chat/WorkGroupBlock.tsx, apps/desktop/src/renderer/components/chat/WorktreeRestoreBanner.tsx, apps/desktop/src/renderer/components/chat/XIcon.tsx, apps/desktop/src/renderer/components/chat/activityRowChrome.ts, apps/desktop/src/renderer/components/chat/autoFollowIntent.ts, apps/desktop/src/renderer/components/chat/chatChrome.ts, apps/desktop/src/renderer/components/chat/errorReasonI18n.ts, apps/desktop/src/renderer/components/chat/imageDisplaySize.ts, apps/desktop/src/renderer/components/chat/lightboxAnnotations.ts, apps/desktop/src/renderer/components/chat/lightboxGestures.ts, apps/desktop/src/renderer/components/chat/markdownImageTargets.ts, apps/desktop/src/renderer/components/chat/messageNavRailModel.ts, apps/desktop/src/renderer/components/chat/messageNavRailWheel.ts, apps/desktop/src/renderer/components/chat/messageStreamIndicatorPosition.ts, apps/desktop/src/renderer/components/chat/messageViewportCompensation.ts, apps/desktop/src/renderer/components/chat/messageWorkGroups.ts, apps/desktop/src/renderer/components/chat/rehypeFencedCodeMarker.ts, apps/desktop/src/renderer/components/chat/rehypeMathBlockMarker.ts, apps/desktop/src/renderer/components/chat/rehypeStreamWordFade.ts, apps/desktop/src/renderer/components/chat/remarkHtmlImages.ts, apps/desktop/src/renderer/components/chat/remarkLocalPathLinks.ts, apps/desktop/src/renderer/components/chat/remarkPreserveRawLocalDestinations.ts, apps/desktop/src/renderer/components/chat/remarkSessionLinks.ts, apps/desktop/src/renderer/components/chat/remarkStrictInlineMath.ts, apps/desktop/src/renderer/components/chat/remarkTruncateCjkUrls.ts, apps/desktop/src/renderer/components/chat/repairStreamingMarkdown.ts, apps/desktop/src/renderer/components/chat/scrollAnchoringDetect.ts, apps/desktop/src/renderer/components/chat/shareSelectionStore.ts, apps/desktop/src/renderer/components/chat/streamingMarkdownBlocks.tsx, apps/desktop/src/renderer/components/chat/streamingMarkdownChunks.ts, apps/desktop/src/renderer/components/chat/toolLoopI18n.ts, apps/desktop/src/renderer/components/chat/unreadCount.ts, apps/desktop/src/renderer/components/chat/useAutomaticHistoryLoadBudget.ts, apps/desktop/src/renderer/components/chat/useCopyAsImage.tsx, apps/desktop/src/renderer/components/chat/useDeleteMessage.ts, apps/desktop/src/renderer/components/chat/useFileChipContextMenu.tsx, apps/desktop/src/renderer/components/chat/useForkAtMessage.ts, apps/desktop/src/renderer/components/chat/useNavigationKeyListener.ts, apps/desktop/src/renderer/components/chat/useOpenWithMenu.tsx, apps/desktop/src/renderer/components/chat/usePrevUserMessageInView.ts, apps/desktop/src/renderer/components/chat/useTurnChangeSets.ts, apps/desktop/src/renderer/components/chat/userMessageCollapse.ts, apps/desktop/src/renderer/components/chat/userMessageDisplayText.ts, apps/desktop/src/renderer/components/chat/userMessageLinkify.ts, apps/desktop/src/renderer/components/chat/viewportFillDetect.ts, apps/desktop/src/renderer/components/new-chat/AddRemoteProjectDialog.tsx, apps/desktop/src/renderer/components/new-chat/AgentSelect.tsx, apps/desktop/src/renderer/components/new-chat/AskUserQuestionPrompt.tsx, apps/desktop/src/renderer/components/new-chat/AtMentionPanel.tsx, apps/desktop/src/renderer/components/new-chat/AttachmentTypeThumb.tsx, apps/desktop/src/renderer/components/new-chat/ChatInput.tsx, apps/desktop/src/renderer/components/new-chat/CjkPunctDecoration.ts, apps/desktop/src/renderer/components/new-chat/CjkPunctuationUtils.ts, apps/desktop/src/renderer/components/new-chat/ComposerListIndentDecoration.ts, apps/desktop/src/renderer/components/new-chat/ComposerListNodes.ts, apps/desktop/src/renderer/components/new-chat/ComposerQuoteNode.tsx, apps/desktop/src/renderer/components/new-chat/DeviceSwitcherPill.tsx, apps/desktop/src/renderer/components/new-chat/EffortSlider.tsx, apps/desktop/src/renderer/components/new-chat/EmptyDocSelectionGuard.ts, apps/desktop/src/renderer/components/new-chat/ExtraDirsButton.tsx, apps/desktop/src/renderer/components/new-chat/FastModeToggle.tsx, apps/desktop/src/renderer/components/new-chat/FolderPickerPopover.tsx, apps/desktop/src/renderer/components/new-chat/FullAccessConfirmContent.tsx, apps/desktop/src/renderer/components/new-chat/GhostCommandDecoration.ts, apps/desktop/src/renderer/components/new-chat/GoalAdvancedLimits.tsx, apps/desktop/src/renderer/components/new-chat/GoalIndicator.tsx, apps/desktop/src/renderer/components/new-chat/HomeUsageDashboard.tsx, apps/desktop/src/renderer/components/new-chat/ListComposerTextarea.tsx, apps/desktop/src/renderer/components/new-chat/MentionChipNode.tsx, apps/desktop/src/renderer/components/new-chat/MentionDragCaretDecoration.ts, apps/desktop/src/renderer/components/new-chat/ModelCompatibilityNotice.tsx, apps/desktop/src/renderer/components/new-chat/ModelConfigFlyout.tsx, apps/desktop/src/renderer/components/new-chat/ModelHarnessPicker.tsx, apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx, apps/desktop/src/renderer/components/new-chat/ModelSourceDetails.tsx, apps/desktop/src/renderer/components/new-chat/NewGoalDialog.tsx, apps/desktop/src/renderer/components/new-chat/PastedTextChipNode.tsx, apps/desktop/src/renderer/components/new-chat/PendingQueuePanel.tsx, apps/desktop/src/renderer/components/new-chat/PermissionPrompt.tsx, apps/desktop/src/renderer/components/new-chat/PermissionSelector.tsx, apps/desktop/src/renderer/components/new-chat/PinnedPlanPanel.tsx, apps/desktop/src/renderer/components/new-chat/PlanActionCard.tsx, apps/desktop/src/renderer/components/new-chat/PlanModeIndicator.tsx, apps/desktop/src/renderer/components/new-chat/PlanViewerCard.tsx, apps/desktop/src/renderer/components/new-chat/PluginSetupPrompt.tsx, apps/desktop/src/renderer/components/new-chat/QuickStartPillMark.ts, apps/desktop/src/renderer/components/new-chat/SendButton.tsx, apps/desktop/src/renderer/components/new-chat/SlashCommandDecoration.ts, apps/desktop/src/renderer/components/new-chat/SlashCommandPalette.tsx, apps/desktop/src/renderer/components/new-chat/TakeoverMask.tsx, apps/desktop/src/renderer/components/new-chat/ThinkingToggle.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedFlyoutHost.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedModelRail.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedModelRow.tsx, apps/desktop/src/renderer/components/new-chat/UsageDailyBars.tsx, apps/desktop/src/renderer/components/new-chat/UsageHeatmap.tsx, apps/desktop/src/renderer/components/new-chat/VendorSegmentedSwitcher.tsx, apps/desktop/src/renderer/components/new-chat/VoiceInputDraftDecoration.ts, apps/desktop/src/renderer/components/new-chat/WindowsSelectionReplacement.ts, apps/desktop/src/renderer/components/new-chat/WorktreeChipsRow.tsx, apps/desktop/src/renderer/components/new-chat/WorktreeCreatingOverlay.tsx, apps/desktop/src/renderer/components/new-chat/agentOptions.ts, apps/desktop/src/renderer/components/new-chat/agentSwitchConfirmation.ts, apps/desktop/src/renderer/components/new-chat/branchPick.ts, apps/desktop/src/renderer/components/new-chat/composerBlankPointerFocus.ts, apps/desktop/src/renderer/components/new-chat/composerContentSerialization.ts, apps/desktop/src/renderer/components/new-chat/composerDocState.ts, apps/desktop/src/renderer/components/new-chat/composerFrameScheduler.ts, apps/desktop/src/renderer/components/new-chat/composerHistoryProjection.ts, apps/desktop/src/renderer/components/new-chat/composerModelSelection.ts, apps/desktop/src/renderer/components/new-chat/composerPromptRecommendation.ts, apps/desktop/src/renderer/components/new-chat/composerRenderGate.ts, apps/desktop/src/renderer/components/new-chat/composerSendOwnership.ts, apps/desktop/src/renderer/components/new-chat/composerSendSnapshot.ts, apps/desktop/src/renderer/components/new-chat/effortChangeQueue.ts, apps/desktop/src/renderer/components/new-chat/extraDirsActions.ts, apps/desktop/src/renderer/components/new-chat/ghostComposerPlacement.ts, apps/desktop/src/renderer/components/new-chat/localAttachmentPicker.ts, apps/desktop/src/renderer/components/new-chat/mentionChipInsertion.ts, apps/desktop/src/renderer/components/new-chat/modelWindowErrorToast.ts, apps/desktop/src/renderer/components/new-chat/pastePipeline.ts, apps/desktop/src/renderer/components/new-chat/pathPaste.ts, apps/desktop/src/renderer/components/new-chat/pendingQueueLocks.ts, apps/desktop/src/renderer/components/new-chat/pendingQueueRowActivity.ts, apps/desktop/src/renderer/components/new-chat/pendingQueueRowPresentation.ts, apps/desktop/src/renderer/components/new-chat/planModeComposerCommand.ts, apps/desktop/src/renderer/components/new-chat/priceTierMarks.tsx, apps/desktop/src/renderer/components/new-chat/remoteBrowseAdapters.ts, apps/desktop/src/renderer/components/new-chat/remoteExistingProjects.ts, apps/desktop/src/renderer/components/new-chat/sessionLinkPaste.ts, apps/desktop/src/renderer/components/new-chat/sourceSwitch.ts, apps/desktop/src/renderer/components/new-chat/unifiedModelSelection.ts, apps/desktop/src/renderer/components/new-chat/usagePalette.ts, apps/desktop/src/renderer/components/new-chat/useComposerSendFocusRestore.ts, apps/desktop/src/renderer/components/new-chat/useModelDiscoveryPending.ts, apps/desktop/src/renderer/components/new-chat/useProviderWeeklyQuota.ts, apps/desktop/src/renderer/components/new-chat/useUnifiedRowActions.ts, apps/desktop/src/renderer/features/bots/BotAuthorizationCard.tsx, apps/desktop/src/renderer/features/bots/BotAvatar.tsx, apps/desktop/src/renderer/features/bots/BotBasicProfileFields.tsx, apps/desktop/src/renderer/features/bots/BotCapabilitySettings.tsx, apps/desktop/src/renderer/features/bots/BotCollaborationCard.tsx, apps/desktop/src/renderer/features/bots/BotConnectionStatus.tsx, apps/desktop/src/renderer/features/bots/BotCreateMenu.tsx, apps/desktop/src/renderer/features/bots/BotDeleteDialog.tsx, apps/desktop/src/renderer/features/bots/BotDirectMessageCard.tsx, apps/desktop/src/renderer/features/bots/BotDirectMessageView.tsx, apps/desktop/src/renderer/features/bots/BotHistorySessionView.tsx, apps/desktop/src/renderer/features/bots/BotInvitationWelcome.tsx, apps/desktop/src/renderer/features/bots/BotLifecycleSettings.tsx, apps/desktop/src/renderer/features/bots/BotModelChainEditor.tsx, apps/desktop/src/renderer/features/bots/BotPortraitPicker.tsx, apps/desktop/src/renderer/features/bots/BotRosterView.tsx, apps/desktop/src/renderer/features/bots/BotRoutines.tsx, apps/desktop/src/renderer/features/bots/BotSessionContentHeader.tsx, apps/desktop/src/renderer/features/bots/BotSessionView.tsx, apps/desktop/src/renderer/features/bots/BotSettingsBlock.tsx, apps/desktop/src/renderer/features/bots/BotSettingsDrawer.tsx, apps/desktop/src/renderer/features/bots/BotsFeatureLayout.tsx, apps/desktop/src/renderer/features/bots/BotsGlobalSettingsSection.tsx, apps/desktop/src/renderer/features/bots/BotsHomeView.tsx, apps/desktop/src/renderer/features/bots/BotsSidebar.tsx, apps/desktop/src/renderer/features/bots/RemoteBotSessionView.tsx, apps/desktop/src/renderer/features/bots/botAvatarIdentity.ts, apps/desktop/src/renderer/features/bots/botCapabilityDefaults.ts, apps/desktop/src/renderer/features/bots/botChatPresentation.ts, apps/desktop/src/renderer/features/bots/botConversationTimeline.ts, apps/desktop/src/renderer/features/bots/botDelegationLive.ts, apps/desktop/src/renderer/features/bots/botGeneratedArtifacts.ts, apps/desktop/src/renderer/features/bots/botListDisplay.ts, apps/desktop/src/renderer/features/bots/botNavigation.ts, apps/desktop/src/renderer/features/bots/botPronounContext.tsx, apps/desktop/src/renderer/features/bots/botReadState.ts, apps/desktop/src/renderer/features/bots/botRosterDisplay.ts, apps/desktop/src/renderer/features/bots/botSessionOwners.ts, apps/desktop/src/renderer/features/bots/botSettingsAutosave.ts, apps/desktop/src/renderer/features/bots/botStore.ts, apps/desktop/src/renderer/features/bots/remoteBotRoster.ts, apps/desktop/src/renderer/features/bots/useBotIslandVisibleSession.ts, apps/desktop/src/renderer/features/bots/useBotSettingsAutosave.ts, apps/desktop/src/renderer/features/bots/useRemoteBots.ts, apps/desktop/src/renderer/features/cc-agent/CCAgentFeatureLayout.tsx, apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx | 293 | 46 | 504 |
+| `desktop.bots` | desktop | 伙伴(列表 / 对话 / 设置 / 历史 / 伙伴私聊) | hash `/bots`、`/bots/:botId`、`/bots/roster` 及伙伴当前/历史任务、伙伴私聊路由(BotsFeatureLayout) | BotBasicProfileFields, BotCollaborationCard, BotDirectMessageView, BotHistorySessionView, BotLifecycleSettings, BotModelChainEditor, BotRosterView, BotSessionView, BotSettingsDrawer, BotsHomeView, RemoteBotSessionView | apps/desktop/src/renderer/components/chat/AgentActionRow.tsx, apps/desktop/src/renderer/components/chat/AgentActionsBlock.tsx, apps/desktop/src/renderer/components/chat/AgentTaskCard.tsx, apps/desktop/src/renderer/components/chat/AskUserQuestionBubble.tsx, apps/desktop/src/renderer/components/chat/AssistantMessage.tsx, apps/desktop/src/renderer/components/chat/AutomationOriginBadge.tsx, apps/desktop/src/renderer/components/chat/ChatAudioCard.tsx, apps/desktop/src/renderer/components/chat/ChatDisplaySnapshotContext.tsx, apps/desktop/src/renderer/components/chat/ChatImageView.tsx, apps/desktop/src/renderer/components/chat/ChatSessionFileContext.tsx, apps/desktop/src/renderer/components/chat/ChatSoundEffectCard.tsx, apps/desktop/src/renderer/components/chat/ChatVideoView.tsx, apps/desktop/src/renderer/components/chat/CindyMakeDoctorCard.tsx, apps/desktop/src/renderer/components/chat/CopyAsImageBlock.tsx, apps/desktop/src/renderer/components/chat/CredentialSwitchWaitBanner.tsx, apps/desktop/src/renderer/components/chat/DiffView.tsx, apps/desktop/src/renderer/components/chat/ErrorBanner.tsx, apps/desktop/src/renderer/components/chat/ErrorMessageCard.tsx, apps/desktop/src/renderer/components/chat/GeneratedFilesCard.tsx, apps/desktop/src/renderer/components/chat/GhostSummonCard.tsx, apps/desktop/src/renderer/components/chat/GhostToolCard.tsx, apps/desktop/src/renderer/components/chat/HookTaskCard.tsx, apps/desktop/src/renderer/components/chat/ImageGalleryContext.tsx, apps/desktop/src/renderer/components/chat/ImageHoverPreview.tsx, apps/desktop/src/renderer/components/chat/ImageLightbox.tsx, apps/desktop/src/renderer/components/chat/ImageMissingPlaceholder.tsx, apps/desktop/src/renderer/components/chat/InlineReferenceChip.tsx, apps/desktop/src/renderer/components/chat/InterruptedTurnBanner.tsx, apps/desktop/src/renderer/components/chat/JumpToBottomChip.tsx, apps/desktop/src/renderer/components/chat/MarkdownDiffBlock.tsx, apps/desktop/src/renderer/components/chat/MarkdownMermaidBlock.tsx, apps/desktop/src/renderer/components/chat/MarkdownRenderer.tsx, apps/desktop/src/renderer/components/chat/MermaidLightbox.tsx, apps/desktop/src/renderer/components/chat/MessageActionBar.tsx, apps/desktop/src/renderer/components/chat/MessageNavRail.tsx, apps/desktop/src/renderer/components/chat/MessageStream.tsx, apps/desktop/src/renderer/components/chat/ModelLightbox.tsx, apps/desktop/src/renderer/components/chat/NewMessageIndicator.tsx, apps/desktop/src/renderer/components/chat/PlanReviewBubble.tsx, apps/desktop/src/renderer/components/chat/PrevMessageJumpChip.tsx, apps/desktop/src/renderer/components/chat/ProjectLinkChip.tsx, apps/desktop/src/renderer/components/chat/QuoteChip.tsx, apps/desktop/src/renderer/components/chat/RewindPreviewDialog.tsx, apps/desktop/src/renderer/components/chat/SelectionQuoteButton.tsx, apps/desktop/src/renderer/components/chat/SentAgentReferenceChip.tsx, apps/desktop/src/renderer/components/chat/SentInlineAtomBody.tsx, apps/desktop/src/renderer/components/chat/SessionHandoffCard.tsx, apps/desktop/src/renderer/components/chat/SessionLinkChip.tsx, apps/desktop/src/renderer/components/chat/ShareMessageCheckbox.tsx, apps/desktop/src/renderer/components/chat/ShareSelectionBar.tsx, apps/desktop/src/renderer/components/chat/SlackIcon.tsx, apps/desktop/src/renderer/components/chat/StreamFadeSpan.tsx, apps/desktop/src/renderer/components/chat/StreamingMarkdownChunk.tsx, apps/desktop/src/renderer/components/chat/SystemCard.tsx, apps/desktop/src/renderer/components/chat/TextLightbox.tsx, apps/desktop/src/renderer/components/chat/ThinkingCard.tsx, apps/desktop/src/renderer/components/chat/ThinkingText.tsx, apps/desktop/src/renderer/components/chat/TodoListCard.tsx, apps/desktop/src/renderer/components/chat/ToolCallCard.tsx, apps/desktop/src/renderer/components/chat/ToolPayloadLightbox.tsx, apps/desktop/src/renderer/components/chat/TopRightChipStack.tsx, apps/desktop/src/renderer/components/chat/TurnChangesCard.tsx, apps/desktop/src/renderer/components/chat/UnreadFailedScheduleBanner.tsx, apps/desktop/src/renderer/components/chat/UpgradeBanner.tsx, apps/desktop/src/renderer/components/chat/UserMessage.tsx, apps/desktop/src/renderer/components/chat/UserMessageEditBox.tsx, apps/desktop/src/renderer/components/chat/UserMessageUrlLink.tsx, apps/desktop/src/renderer/components/chat/VideoLightbox.tsx, apps/desktop/src/renderer/components/chat/WorkGroupBlock.tsx, apps/desktop/src/renderer/components/chat/WorktreeRestoreBanner.tsx, apps/desktop/src/renderer/components/chat/XIcon.tsx, apps/desktop/src/renderer/components/chat/activityRowChrome.ts, apps/desktop/src/renderer/components/chat/autoFollowIntent.ts, apps/desktop/src/renderer/components/chat/chatChrome.ts, apps/desktop/src/renderer/components/chat/errorReasonI18n.ts, apps/desktop/src/renderer/components/chat/imageDisplaySize.ts, apps/desktop/src/renderer/components/chat/lightboxAnnotations.ts, apps/desktop/src/renderer/components/chat/lightboxGestures.ts, apps/desktop/src/renderer/components/chat/markdownImageTargets.ts, apps/desktop/src/renderer/components/chat/messageNavRailModel.ts, apps/desktop/src/renderer/components/chat/messageNavRailWheel.ts, apps/desktop/src/renderer/components/chat/messageStreamIndicatorPosition.ts, apps/desktop/src/renderer/components/chat/messageViewportCompensation.ts, apps/desktop/src/renderer/components/chat/messageWorkGroups.ts, apps/desktop/src/renderer/components/chat/rehypeFencedCodeMarker.ts, apps/desktop/src/renderer/components/chat/rehypeMathBlockMarker.ts, apps/desktop/src/renderer/components/chat/rehypeStreamWordFade.ts, apps/desktop/src/renderer/components/chat/remarkHtmlImages.ts, apps/desktop/src/renderer/components/chat/remarkLocalPathLinks.ts, apps/desktop/src/renderer/components/chat/remarkPreserveRawLocalDestinations.ts, apps/desktop/src/renderer/components/chat/remarkSessionLinks.ts, apps/desktop/src/renderer/components/chat/remarkStrictInlineMath.ts, apps/desktop/src/renderer/components/chat/remarkTruncateCjkUrls.ts, apps/desktop/src/renderer/components/chat/repairStreamingMarkdown.ts, apps/desktop/src/renderer/components/chat/scrollAnchoringDetect.ts, apps/desktop/src/renderer/components/chat/shareSelectionStore.ts, apps/desktop/src/renderer/components/chat/streamingMarkdownBlocks.tsx, apps/desktop/src/renderer/components/chat/streamingMarkdownChunks.ts, apps/desktop/src/renderer/components/chat/toolLoopI18n.ts, apps/desktop/src/renderer/components/chat/unreadCount.ts, apps/desktop/src/renderer/components/chat/useAutomaticHistoryLoadBudget.ts, apps/desktop/src/renderer/components/chat/useCopyAsImage.tsx, apps/desktop/src/renderer/components/chat/useDeleteMessage.ts, apps/desktop/src/renderer/components/chat/useFileChipContextMenu.tsx, apps/desktop/src/renderer/components/chat/useForkAtMessage.ts, apps/desktop/src/renderer/components/chat/useNavigationKeyListener.ts, apps/desktop/src/renderer/components/chat/useOpenWithMenu.tsx, apps/desktop/src/renderer/components/chat/usePrevUserMessageInView.ts, apps/desktop/src/renderer/components/chat/useTurnChangeSets.ts, apps/desktop/src/renderer/components/chat/userMessageCollapse.ts, apps/desktop/src/renderer/components/chat/userMessageDisplayText.ts, apps/desktop/src/renderer/components/chat/userMessageLinkify.ts, apps/desktop/src/renderer/components/chat/viewportFillDetect.ts, apps/desktop/src/renderer/components/new-chat/AddRemoteProjectDialog.tsx, apps/desktop/src/renderer/components/new-chat/AgentSelect.tsx, apps/desktop/src/renderer/components/new-chat/AskUserQuestionPrompt.tsx, apps/desktop/src/renderer/components/new-chat/AtMentionPanel.tsx, apps/desktop/src/renderer/components/new-chat/AttachmentTypeThumb.tsx, apps/desktop/src/renderer/components/new-chat/ChatInput.tsx, apps/desktop/src/renderer/components/new-chat/CjkPunctDecoration.ts, apps/desktop/src/renderer/components/new-chat/CjkPunctuationUtils.ts, apps/desktop/src/renderer/components/new-chat/ComposerListIndentDecoration.ts, apps/desktop/src/renderer/components/new-chat/ComposerListNodes.ts, apps/desktop/src/renderer/components/new-chat/ComposerQuoteNode.tsx, apps/desktop/src/renderer/components/new-chat/DeviceSwitcherPill.tsx, apps/desktop/src/renderer/components/new-chat/EffortSlider.tsx, apps/desktop/src/renderer/components/new-chat/EmptyDocSelectionGuard.ts, apps/desktop/src/renderer/components/new-chat/ExtraDirsButton.tsx, apps/desktop/src/renderer/components/new-chat/FastModeToggle.tsx, apps/desktop/src/renderer/components/new-chat/FolderPickerPopover.tsx, apps/desktop/src/renderer/components/new-chat/FullAccessConfirmContent.tsx, apps/desktop/src/renderer/components/new-chat/GhostCommandDecoration.ts, apps/desktop/src/renderer/components/new-chat/GoalAdvancedLimits.tsx, apps/desktop/src/renderer/components/new-chat/GoalIndicator.tsx, apps/desktop/src/renderer/components/new-chat/HomeUsageDashboard.tsx, apps/desktop/src/renderer/components/new-chat/ListComposerTextarea.tsx, apps/desktop/src/renderer/components/new-chat/MentionChipNode.tsx, apps/desktop/src/renderer/components/new-chat/MentionDragCaretDecoration.ts, apps/desktop/src/renderer/components/new-chat/ModelCompatibilityNotice.tsx, apps/desktop/src/renderer/components/new-chat/ModelConfigFlyout.tsx, apps/desktop/src/renderer/components/new-chat/ModelHarnessPicker.tsx, apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx, apps/desktop/src/renderer/components/new-chat/ModelSourceDetails.tsx, apps/desktop/src/renderer/components/new-chat/NewGoalDialog.tsx, apps/desktop/src/renderer/components/new-chat/PastedTextChipNode.tsx, apps/desktop/src/renderer/components/new-chat/PendingQueuePanel.tsx, apps/desktop/src/renderer/components/new-chat/PermissionPrompt.tsx, apps/desktop/src/renderer/components/new-chat/PermissionSelector.tsx, apps/desktop/src/renderer/components/new-chat/PinnedPlanPanel.tsx, apps/desktop/src/renderer/components/new-chat/PlanActionCard.tsx, apps/desktop/src/renderer/components/new-chat/PlanModeIndicator.tsx, apps/desktop/src/renderer/components/new-chat/PlanViewerCard.tsx, apps/desktop/src/renderer/components/new-chat/PluginSetupPrompt.tsx, apps/desktop/src/renderer/components/new-chat/QuickStartPillMark.ts, apps/desktop/src/renderer/components/new-chat/SendButton.tsx, apps/desktop/src/renderer/components/new-chat/SlashCommandDecoration.ts, apps/desktop/src/renderer/components/new-chat/SlashCommandPalette.tsx, apps/desktop/src/renderer/components/new-chat/TakeoverMask.tsx, apps/desktop/src/renderer/components/new-chat/ThinkingToggle.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedFlyoutHost.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedModelRail.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedModelRow.tsx, apps/desktop/src/renderer/components/new-chat/UsageDailyBars.tsx, apps/desktop/src/renderer/components/new-chat/UsageHeatmap.tsx, apps/desktop/src/renderer/components/new-chat/VendorSegmentedSwitcher.tsx, apps/desktop/src/renderer/components/new-chat/VoiceInputDraftDecoration.ts, apps/desktop/src/renderer/components/new-chat/WindowsSelectionReplacement.ts, apps/desktop/src/renderer/components/new-chat/WorktreeChipsRow.tsx, apps/desktop/src/renderer/components/new-chat/WorktreeCreatingOverlay.tsx, apps/desktop/src/renderer/components/new-chat/agentOptions.ts, apps/desktop/src/renderer/components/new-chat/agentSwitchConfirmation.ts, apps/desktop/src/renderer/components/new-chat/branchPick.ts, apps/desktop/src/renderer/components/new-chat/composerBlankPointerFocus.ts, apps/desktop/src/renderer/components/new-chat/composerContentSerialization.ts, apps/desktop/src/renderer/components/new-chat/composerDocState.ts, apps/desktop/src/renderer/components/new-chat/composerFrameScheduler.ts, apps/desktop/src/renderer/components/new-chat/composerHistoryProjection.ts, apps/desktop/src/renderer/components/new-chat/composerModelSelection.ts, apps/desktop/src/renderer/components/new-chat/composerPromptRecommendation.ts, apps/desktop/src/renderer/components/new-chat/composerRenderGate.ts, apps/desktop/src/renderer/components/new-chat/composerSendOwnership.ts, apps/desktop/src/renderer/components/new-chat/composerSendSnapshot.ts, apps/desktop/src/renderer/components/new-chat/effortChangeQueue.ts, apps/desktop/src/renderer/components/new-chat/extraDirsActions.ts, apps/desktop/src/renderer/components/new-chat/ghostComposerPlacement.ts, apps/desktop/src/renderer/components/new-chat/localAttachmentPicker.ts, apps/desktop/src/renderer/components/new-chat/mentionChipInsertion.ts, apps/desktop/src/renderer/components/new-chat/modelWindowErrorToast.ts, apps/desktop/src/renderer/components/new-chat/pastePipeline.ts, apps/desktop/src/renderer/components/new-chat/pathPaste.ts, apps/desktop/src/renderer/components/new-chat/pendingQueueLocks.ts, apps/desktop/src/renderer/components/new-chat/pendingQueueRowActivity.ts, apps/desktop/src/renderer/components/new-chat/pendingQueueRowPresentation.ts, apps/desktop/src/renderer/components/new-chat/planModeComposerCommand.ts, apps/desktop/src/renderer/components/new-chat/priceTierMarks.tsx, apps/desktop/src/renderer/components/new-chat/remoteBrowseAdapters.ts, apps/desktop/src/renderer/components/new-chat/remoteExistingProjects.ts, apps/desktop/src/renderer/components/new-chat/sessionLinkPaste.ts, apps/desktop/src/renderer/components/new-chat/sourceSwitch.ts, apps/desktop/src/renderer/components/new-chat/unifiedModelSelection.ts, apps/desktop/src/renderer/components/new-chat/usagePalette.ts, apps/desktop/src/renderer/components/new-chat/useComposerSendFocusRestore.ts, apps/desktop/src/renderer/components/new-chat/useModelDiscoveryPending.ts, apps/desktop/src/renderer/components/new-chat/useProviderWeeklyQuota.ts, apps/desktop/src/renderer/components/new-chat/useUnifiedRowActions.ts, apps/desktop/src/renderer/features/bots/BotAuthorizationCard.tsx, apps/desktop/src/renderer/features/bots/BotAvatar.tsx, apps/desktop/src/renderer/features/bots/BotBasicProfileFields.tsx, apps/desktop/src/renderer/features/bots/BotCapabilitySettings.tsx, apps/desktop/src/renderer/features/bots/BotCollaborationCard.tsx, apps/desktop/src/renderer/features/bots/BotConnectionStatus.tsx, apps/desktop/src/renderer/features/bots/BotCreateMenu.tsx, apps/desktop/src/renderer/features/bots/BotDeleteDialog.tsx, apps/desktop/src/renderer/features/bots/BotDirectMessageCard.tsx, apps/desktop/src/renderer/features/bots/BotDirectMessageView.tsx, apps/desktop/src/renderer/features/bots/BotHistorySessionView.tsx, apps/desktop/src/renderer/features/bots/BotInvitationWelcome.tsx, apps/desktop/src/renderer/features/bots/BotLifecycleSettings.tsx, apps/desktop/src/renderer/features/bots/BotModelChainEditor.tsx, apps/desktop/src/renderer/features/bots/BotPortraitPicker.tsx, apps/desktop/src/renderer/features/bots/BotRosterView.tsx, apps/desktop/src/renderer/features/bots/BotRoutines.tsx, apps/desktop/src/renderer/features/bots/BotSessionContentHeader.tsx, apps/desktop/src/renderer/features/bots/BotSessionView.tsx, apps/desktop/src/renderer/features/bots/BotSettingsBlock.tsx, apps/desktop/src/renderer/features/bots/BotSettingsDrawer.tsx, apps/desktop/src/renderer/features/bots/BotsFeatureLayout.tsx, apps/desktop/src/renderer/features/bots/BotsGlobalSettingsSection.tsx, apps/desktop/src/renderer/features/bots/BotsHomeView.tsx, apps/desktop/src/renderer/features/bots/BotsSidebar.tsx, apps/desktop/src/renderer/features/bots/RemoteBotSessionView.tsx, apps/desktop/src/renderer/features/bots/botAvatarIdentity.ts, apps/desktop/src/renderer/features/bots/botCapabilityDefaults.ts, apps/desktop/src/renderer/features/bots/botChatPresentation.ts, apps/desktop/src/renderer/features/bots/botConversationTimeline.ts, apps/desktop/src/renderer/features/bots/botDelegationLive.ts, apps/desktop/src/renderer/features/bots/botGeneratedArtifacts.ts, apps/desktop/src/renderer/features/bots/botListDisplay.ts, apps/desktop/src/renderer/features/bots/botNavigation.ts, apps/desktop/src/renderer/features/bots/botPronounContext.tsx, apps/desktop/src/renderer/features/bots/botReadState.ts, apps/desktop/src/renderer/features/bots/botRosterDisplay.ts, apps/desktop/src/renderer/features/bots/botSessionOwners.ts, apps/desktop/src/renderer/features/bots/botSettingsAutosave.ts, apps/desktop/src/renderer/features/bots/botStore.ts, apps/desktop/src/renderer/features/bots/remoteBotRoster.ts, apps/desktop/src/renderer/features/bots/useBotIslandVisibleSession.ts, apps/desktop/src/renderer/features/bots/useBotSettingsAutosave.ts, apps/desktop/src/renderer/features/bots/useRemoteBots.ts, apps/desktop/src/renderer/features/cc-agent/CCAgentFeatureLayout.tsx, apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx | 293 | 46 | 502 |
| `desktop.chat.files` | desktop | 工作目录文件浏览 | hash `/cc-agent/files/:sessionId`(WorkdirBrowseRoute) | FileBodyView, FileTreeView, WorkdirBrowseRoute | apps/desktop/src/renderer/features/cc-agent/workdir-browse/DocSearchBar.tsx, apps/desktop/src/renderer/features/cc-agent/workdir-browse/DrawioPreview.tsx, apps/desktop/src/renderer/features/cc-agent/workdir-browse/FileBodyView.tsx, apps/desktop/src/renderer/features/cc-agent/workdir-browse/FileFilterInput.tsx, apps/desktop/src/renderer/features/cc-agent/workdir-browse/FileTabsBar.tsx, apps/desktop/src/renderer/features/cc-agent/workdir-browse/FileTreeView.tsx, apps/desktop/src/renderer/features/cc-agent/workdir-browse/FilterResultList.tsx, apps/desktop/src/renderer/features/cc-agent/workdir-browse/ImagePreview.tsx, apps/desktop/src/renderer/features/cc-agent/workdir-browse/OpenInSystemActions.tsx, apps/desktop/src/renderer/features/cc-agent/workdir-browse/PdfPreview.tsx, apps/desktop/src/renderer/features/cc-agent/workdir-browse/SessionTabsBar.tsx, apps/desktop/src/renderer/features/cc-agent/workdir-browse/UnrenderablePlaceholder.tsx, apps/desktop/src/renderer/features/cc-agent/workdir-browse/WorkdirBrowseRoute.tsx, apps/desktop/src/renderer/features/cc-agent/workdir-browse/WorkdirBrowseSidebar.tsx, apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useChatRailCollapsed.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useChatRailResize.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useConfirmSwitchAwayIfDirty.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useDelayedFlag.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useFileContent.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useFileTree.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useOpenTabs.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useProjectFileList.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useRevealFileInTree.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/lib/activeFileBodyHandle.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/lib/docModeSwitchProjects.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/lib/drawioExt.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/lib/expandedStore.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/lib/fileContentCache.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/lib/fileIcon.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/lib/fileMeta.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/lib/fileScrollStore.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/lib/fileSelectionParams.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/lib/filterFiles.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/lib/imageExt.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/lib/markdownAutosave.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/lib/openTabsStore.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/lib/pdfExt.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/lib/selectedFileStore.ts, apps/desktop/src/renderer/features/cc-agent/workdir-browse/search/SearchInput.tsx, apps/desktop/src/renderer/features/cc-agent/workdir-browse/search/SearchPanel.tsx, apps/desktop/src/renderer/features/cc-agent/workdir-browse/search/SearchResults.tsx, apps/desktop/src/renderer/features/cc-agent/workdir-browse/search/hooks/useProjectSearch.ts | 22 | 7 | 64 |
| `desktop.chat.new-draft` | desktop | 新建任务草稿页 | hash `/cc-agent/new`(NewMakerDraftRoute) | NewMakerDraftRoute | apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx | 15 | 0 | 2 |
-| `desktop.chat.orca-workflow` | desktop | Orca 协同工作台 | hash `/cc-agent/orca/:sessionId`(OrcaWorkflowRoute) | CCAgentSessionView, OrcaSplitView, OrcaWorkerPanel, OrcaWorkflowRoute | apps/desktop/src/renderer/components/chat/AgentActionRow.tsx, apps/desktop/src/renderer/components/chat/AgentActionsBlock.tsx, apps/desktop/src/renderer/components/chat/AgentTaskCard.tsx, apps/desktop/src/renderer/components/chat/AskUserQuestionBubble.tsx, apps/desktop/src/renderer/components/chat/AssistantMessage.tsx, apps/desktop/src/renderer/components/chat/AutomationOriginBadge.tsx, apps/desktop/src/renderer/components/chat/ChatAudioCard.tsx, apps/desktop/src/renderer/components/chat/ChatDisplaySnapshotContext.tsx, apps/desktop/src/renderer/components/chat/ChatImageView.tsx, apps/desktop/src/renderer/components/chat/ChatSessionFileContext.tsx, apps/desktop/src/renderer/components/chat/ChatSoundEffectCard.tsx, apps/desktop/src/renderer/components/chat/ChatVideoView.tsx, apps/desktop/src/renderer/components/chat/CindyMakeCommandDialog.tsx, apps/desktop/src/renderer/components/chat/CindyMakeDoctorCard.tsx, apps/desktop/src/renderer/components/chat/CopyAsImageBlock.tsx, apps/desktop/src/renderer/components/chat/CredentialSwitchWaitBanner.tsx, apps/desktop/src/renderer/components/chat/DiffView.tsx, apps/desktop/src/renderer/components/chat/ErrorBanner.tsx, apps/desktop/src/renderer/components/chat/ErrorMessageCard.tsx, apps/desktop/src/renderer/components/chat/GeneratedFilesCard.tsx, apps/desktop/src/renderer/components/chat/GhostSummonCard.tsx, apps/desktop/src/renderer/components/chat/GhostToolCard.tsx, apps/desktop/src/renderer/components/chat/HookTaskCard.tsx, apps/desktop/src/renderer/components/chat/ImageGalleryContext.tsx, apps/desktop/src/renderer/components/chat/ImageHoverPreview.tsx, apps/desktop/src/renderer/components/chat/ImageLightbox.tsx, apps/desktop/src/renderer/components/chat/ImageMissingPlaceholder.tsx, apps/desktop/src/renderer/components/chat/InlineReferenceChip.tsx, apps/desktop/src/renderer/components/chat/InterruptedTurnBanner.tsx, apps/desktop/src/renderer/components/chat/JumpToBottomChip.tsx, apps/desktop/src/renderer/components/chat/MarkdownDiffBlock.tsx, apps/desktop/src/renderer/components/chat/MarkdownMermaidBlock.tsx, apps/desktop/src/renderer/components/chat/MarkdownRenderer.tsx, apps/desktop/src/renderer/components/chat/MermaidLightbox.tsx, apps/desktop/src/renderer/components/chat/MessageActionBar.tsx, apps/desktop/src/renderer/components/chat/MessageNavRail.tsx, apps/desktop/src/renderer/components/chat/MessageStream.tsx, apps/desktop/src/renderer/components/chat/ModelLightbox.tsx, apps/desktop/src/renderer/components/chat/NewMessageIndicator.tsx, apps/desktop/src/renderer/components/chat/PlanReviewBubble.tsx, apps/desktop/src/renderer/components/chat/PrevMessageJumpChip.tsx, apps/desktop/src/renderer/components/chat/ProjectLinkChip.tsx, apps/desktop/src/renderer/components/chat/QuoteChip.tsx, apps/desktop/src/renderer/components/chat/RewindPreviewDialog.tsx, apps/desktop/src/renderer/components/chat/SelectionQuoteButton.tsx, apps/desktop/src/renderer/components/chat/SentAgentReferenceChip.tsx, apps/desktop/src/renderer/components/chat/SentInlineAtomBody.tsx, apps/desktop/src/renderer/components/chat/SessionHandoffCard.tsx, apps/desktop/src/renderer/components/chat/SessionLinkChip.tsx, apps/desktop/src/renderer/components/chat/ShareMessageCheckbox.tsx, apps/desktop/src/renderer/components/chat/ShareSelectionBar.tsx, apps/desktop/src/renderer/components/chat/SlackIcon.tsx, apps/desktop/src/renderer/components/chat/StreamFadeSpan.tsx, apps/desktop/src/renderer/components/chat/StreamingMarkdownChunk.tsx, apps/desktop/src/renderer/components/chat/SystemCard.tsx, apps/desktop/src/renderer/components/chat/TextLightbox.tsx, apps/desktop/src/renderer/components/chat/ThinkingCard.tsx, apps/desktop/src/renderer/components/chat/ThinkingText.tsx, apps/desktop/src/renderer/components/chat/TodoListCard.tsx, apps/desktop/src/renderer/components/chat/ToolCallCard.tsx, apps/desktop/src/renderer/components/chat/ToolPayloadLightbox.tsx, apps/desktop/src/renderer/components/chat/TopRightChipStack.tsx, apps/desktop/src/renderer/components/chat/TurnChangesCard.tsx, apps/desktop/src/renderer/components/chat/UnreadFailedScheduleBanner.tsx, apps/desktop/src/renderer/components/chat/UpgradeBanner.tsx, apps/desktop/src/renderer/components/chat/UserMessage.tsx, apps/desktop/src/renderer/components/chat/UserMessageEditBox.tsx, apps/desktop/src/renderer/components/chat/UserMessageUrlLink.tsx, apps/desktop/src/renderer/components/chat/VideoLightbox.tsx, apps/desktop/src/renderer/components/chat/WorkGroupBlock.tsx, apps/desktop/src/renderer/components/chat/WorktreeRestoreBanner.tsx, apps/desktop/src/renderer/components/chat/XIcon.tsx, apps/desktop/src/renderer/components/chat/activityRowChrome.ts, apps/desktop/src/renderer/components/chat/autoFollowIntent.ts, apps/desktop/src/renderer/components/chat/chatChrome.ts, apps/desktop/src/renderer/components/chat/errorReasonI18n.ts, apps/desktop/src/renderer/components/chat/imageDisplaySize.ts, apps/desktop/src/renderer/components/chat/lightboxAnnotations.ts, apps/desktop/src/renderer/components/chat/lightboxGestures.ts, apps/desktop/src/renderer/components/chat/markdownImageTargets.ts, apps/desktop/src/renderer/components/chat/messageNavRailModel.ts, apps/desktop/src/renderer/components/chat/messageNavRailWheel.ts, apps/desktop/src/renderer/components/chat/messageStreamIndicatorPosition.ts, apps/desktop/src/renderer/components/chat/messageViewportCompensation.ts, apps/desktop/src/renderer/components/chat/messageWorkGroups.ts, apps/desktop/src/renderer/components/chat/rehypeFencedCodeMarker.ts, apps/desktop/src/renderer/components/chat/rehypeMathBlockMarker.ts, apps/desktop/src/renderer/components/chat/rehypeStreamWordFade.ts, apps/desktop/src/renderer/components/chat/remarkHtmlImages.ts, apps/desktop/src/renderer/components/chat/remarkLocalPathLinks.ts, apps/desktop/src/renderer/components/chat/remarkPreserveRawLocalDestinations.ts, apps/desktop/src/renderer/components/chat/remarkSessionLinks.ts, apps/desktop/src/renderer/components/chat/remarkStrictInlineMath.ts, apps/desktop/src/renderer/components/chat/remarkTruncateCjkUrls.ts, apps/desktop/src/renderer/components/chat/repairStreamingMarkdown.ts, apps/desktop/src/renderer/components/chat/scrollAnchoringDetect.ts, apps/desktop/src/renderer/components/chat/shareSelectionStore.ts, apps/desktop/src/renderer/components/chat/streamingMarkdownBlocks.tsx, apps/desktop/src/renderer/components/chat/streamingMarkdownChunks.ts, apps/desktop/src/renderer/components/chat/toolLoopI18n.ts, apps/desktop/src/renderer/components/chat/unreadCount.ts, apps/desktop/src/renderer/components/chat/useAutomaticHistoryLoadBudget.ts, apps/desktop/src/renderer/components/chat/useCopyAsImage.tsx, apps/desktop/src/renderer/components/chat/useDeleteMessage.ts, apps/desktop/src/renderer/components/chat/useFileChipContextMenu.tsx, apps/desktop/src/renderer/components/chat/useForkAtMessage.ts, apps/desktop/src/renderer/components/chat/useNavigationKeyListener.ts, apps/desktop/src/renderer/components/chat/useOpenWithMenu.tsx, apps/desktop/src/renderer/components/chat/usePrevUserMessageInView.ts, apps/desktop/src/renderer/components/chat/useTurnChangeSets.ts, apps/desktop/src/renderer/components/chat/userMessageCollapse.ts, apps/desktop/src/renderer/components/chat/userMessageDisplayText.ts, apps/desktop/src/renderer/components/chat/userMessageLinkify.ts, apps/desktop/src/renderer/components/chat/viewportFillDetect.ts, apps/desktop/src/renderer/components/new-chat/AddRemoteProjectDialog.tsx, apps/desktop/src/renderer/components/new-chat/AgentSelect.tsx, apps/desktop/src/renderer/components/new-chat/AskUserQuestionPrompt.tsx, apps/desktop/src/renderer/components/new-chat/AtMentionPanel.tsx, apps/desktop/src/renderer/components/new-chat/AttachmentTypeThumb.tsx, apps/desktop/src/renderer/components/new-chat/ChatInput.tsx, apps/desktop/src/renderer/components/new-chat/CjkPunctDecoration.ts, apps/desktop/src/renderer/components/new-chat/CjkPunctuationUtils.ts, apps/desktop/src/renderer/components/new-chat/ComposerListIndentDecoration.ts, apps/desktop/src/renderer/components/new-chat/ComposerListNodes.ts, apps/desktop/src/renderer/components/new-chat/ComposerQuoteNode.tsx, apps/desktop/src/renderer/components/new-chat/DeviceSwitcherPill.tsx, apps/desktop/src/renderer/components/new-chat/EffortSlider.tsx, apps/desktop/src/renderer/components/new-chat/EmptyDocSelectionGuard.ts, apps/desktop/src/renderer/components/new-chat/ExtraDirsButton.tsx, apps/desktop/src/renderer/components/new-chat/FastModeToggle.tsx, apps/desktop/src/renderer/components/new-chat/FolderPickerPopover.tsx, apps/desktop/src/renderer/components/new-chat/FullAccessConfirmContent.tsx, apps/desktop/src/renderer/components/new-chat/GhostCommandDecoration.ts, apps/desktop/src/renderer/components/new-chat/GoalAdvancedLimits.tsx, apps/desktop/src/renderer/components/new-chat/GoalIndicator.tsx, apps/desktop/src/renderer/components/new-chat/HomeUsageDashboard.tsx, apps/desktop/src/renderer/components/new-chat/ListComposerTextarea.tsx, apps/desktop/src/renderer/components/new-chat/MentionChipNode.tsx, apps/desktop/src/renderer/components/new-chat/MentionDragCaretDecoration.ts, apps/desktop/src/renderer/components/new-chat/ModelCompatibilityNotice.tsx, apps/desktop/src/renderer/components/new-chat/ModelConfigFlyout.tsx, apps/desktop/src/renderer/components/new-chat/ModelHarnessPicker.tsx, apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx, apps/desktop/src/renderer/components/new-chat/ModelSourceDetails.tsx, apps/desktop/src/renderer/components/new-chat/NewGoalDialog.tsx, apps/desktop/src/renderer/components/new-chat/PastedTextChipNode.tsx, apps/desktop/src/renderer/components/new-chat/PendingQueuePanel.tsx, apps/desktop/src/renderer/components/new-chat/PermissionPrompt.tsx, apps/desktop/src/renderer/components/new-chat/PermissionSelector.tsx, apps/desktop/src/renderer/components/new-chat/PinnedPlanPanel.tsx, apps/desktop/src/renderer/components/new-chat/PlanActionCard.tsx, apps/desktop/src/renderer/components/new-chat/PlanModeIndicator.tsx, apps/desktop/src/renderer/components/new-chat/PlanViewerCard.tsx, apps/desktop/src/renderer/components/new-chat/PluginSetupPrompt.tsx, apps/desktop/src/renderer/components/new-chat/QuickStartPillMark.ts, apps/desktop/src/renderer/components/new-chat/SendButton.tsx, apps/desktop/src/renderer/components/new-chat/SlashCommandDecoration.ts, apps/desktop/src/renderer/components/new-chat/SlashCommandPalette.tsx, apps/desktop/src/renderer/components/new-chat/TakeoverMask.tsx, apps/desktop/src/renderer/components/new-chat/ThinkingToggle.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedFlyoutHost.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedModelRail.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedModelRow.tsx, apps/desktop/src/renderer/components/new-chat/UsageDailyBars.tsx, apps/desktop/src/renderer/components/new-chat/UsageHeatmap.tsx, apps/desktop/src/renderer/components/new-chat/VendorSegmentedSwitcher.tsx, apps/desktop/src/renderer/components/new-chat/VoiceInputDraftDecoration.ts, apps/desktop/src/renderer/components/new-chat/WindowsSelectionReplacement.ts, apps/desktop/src/renderer/components/new-chat/WorktreeChipsRow.tsx, apps/desktop/src/renderer/components/new-chat/WorktreeCreatingOverlay.tsx, apps/desktop/src/renderer/components/new-chat/agentOptions.ts, apps/desktop/src/renderer/components/new-chat/agentSwitchConfirmation.ts, apps/desktop/src/renderer/components/new-chat/branchPick.ts, apps/desktop/src/renderer/components/new-chat/composerBlankPointerFocus.ts, apps/desktop/src/renderer/components/new-chat/composerContentSerialization.ts, apps/desktop/src/renderer/components/new-chat/composerDocState.ts, apps/desktop/src/renderer/components/new-chat/composerFrameScheduler.ts, apps/desktop/src/renderer/components/new-chat/composerHistoryProjection.ts, apps/desktop/src/renderer/components/new-chat/composerModelSelection.ts, apps/desktop/src/renderer/components/new-chat/composerPromptRecommendation.ts, apps/desktop/src/renderer/components/new-chat/composerRenderGate.ts, apps/desktop/src/renderer/components/new-chat/composerSendOwnership.ts, apps/desktop/src/renderer/components/new-chat/composerSendSnapshot.ts, apps/desktop/src/renderer/components/new-chat/effortChangeQueue.ts, apps/desktop/src/renderer/components/new-chat/extraDirsActions.ts, apps/desktop/src/renderer/components/new-chat/ghostComposerPlacement.ts, apps/desktop/src/renderer/components/new-chat/localAttachmentPicker.ts, apps/desktop/src/renderer/components/new-chat/mentionChipInsertion.ts, apps/desktop/src/renderer/components/new-chat/modelWindowErrorToast.ts, apps/desktop/src/renderer/components/new-chat/pastePipeline.ts, apps/desktop/src/renderer/components/new-chat/pathPaste.ts, apps/desktop/src/renderer/components/new-chat/pendingQueueLocks.ts, apps/desktop/src/renderer/components/new-chat/pendingQueueRowActivity.ts, apps/desktop/src/renderer/components/new-chat/pendingQueueRowPresentation.ts, apps/desktop/src/renderer/components/new-chat/planModeComposerCommand.ts, apps/desktop/src/renderer/components/new-chat/priceTierMarks.tsx, apps/desktop/src/renderer/components/new-chat/remoteBrowseAdapters.ts, apps/desktop/src/renderer/components/new-chat/remoteExistingProjects.ts, apps/desktop/src/renderer/components/new-chat/sessionLinkPaste.ts, apps/desktop/src/renderer/components/new-chat/sourceSwitch.ts, apps/desktop/src/renderer/components/new-chat/unifiedModelSelection.ts, apps/desktop/src/renderer/components/new-chat/usagePalette.ts, apps/desktop/src/renderer/components/new-chat/useComposerSendFocusRestore.ts, apps/desktop/src/renderer/components/new-chat/useModelDiscoveryPending.ts, apps/desktop/src/renderer/components/new-chat/useProviderWeeklyQuota.ts, apps/desktop/src/renderer/components/new-chat/useUnifiedRowActions.ts, apps/desktop/src/renderer/features/cc-agent/CCAgentFeatureLayout.tsx, apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx, apps/desktop/src/renderer/features/cc-agent/OrcaSplitView.tsx, apps/desktop/src/renderer/features/cc-agent/OrcaWorkerPanel.tsx, apps/desktop/src/renderer/features/cc-agent/OrcaWorkflowRoute.tsx | 273 | 46 | 410 |
+| `desktop.chat.orca-workflow` | desktop | Orca 协同工作台 | hash `/cc-agent/orca/:sessionId`(OrcaWorkflowRoute) | CCAgentSessionView, OrcaSplitView, OrcaWorkerPanel, OrcaWorkflowRoute | apps/desktop/src/renderer/components/chat/AgentActionRow.tsx, apps/desktop/src/renderer/components/chat/AgentActionsBlock.tsx, apps/desktop/src/renderer/components/chat/AgentTaskCard.tsx, apps/desktop/src/renderer/components/chat/AskUserQuestionBubble.tsx, apps/desktop/src/renderer/components/chat/AssistantMessage.tsx, apps/desktop/src/renderer/components/chat/AutomationOriginBadge.tsx, apps/desktop/src/renderer/components/chat/ChatAudioCard.tsx, apps/desktop/src/renderer/components/chat/ChatDisplaySnapshotContext.tsx, apps/desktop/src/renderer/components/chat/ChatImageView.tsx, apps/desktop/src/renderer/components/chat/ChatSessionFileContext.tsx, apps/desktop/src/renderer/components/chat/ChatSoundEffectCard.tsx, apps/desktop/src/renderer/components/chat/ChatVideoView.tsx, apps/desktop/src/renderer/components/chat/CindyMakeDoctorCard.tsx, apps/desktop/src/renderer/components/chat/CopyAsImageBlock.tsx, apps/desktop/src/renderer/components/chat/CredentialSwitchWaitBanner.tsx, apps/desktop/src/renderer/components/chat/DiffView.tsx, apps/desktop/src/renderer/components/chat/ErrorBanner.tsx, apps/desktop/src/renderer/components/chat/ErrorMessageCard.tsx, apps/desktop/src/renderer/components/chat/GeneratedFilesCard.tsx, apps/desktop/src/renderer/components/chat/GhostSummonCard.tsx, apps/desktop/src/renderer/components/chat/GhostToolCard.tsx, apps/desktop/src/renderer/components/chat/HookTaskCard.tsx, apps/desktop/src/renderer/components/chat/ImageGalleryContext.tsx, apps/desktop/src/renderer/components/chat/ImageHoverPreview.tsx, apps/desktop/src/renderer/components/chat/ImageLightbox.tsx, apps/desktop/src/renderer/components/chat/ImageMissingPlaceholder.tsx, apps/desktop/src/renderer/components/chat/InlineReferenceChip.tsx, apps/desktop/src/renderer/components/chat/InterruptedTurnBanner.tsx, apps/desktop/src/renderer/components/chat/JumpToBottomChip.tsx, apps/desktop/src/renderer/components/chat/MarkdownDiffBlock.tsx, apps/desktop/src/renderer/components/chat/MarkdownMermaidBlock.tsx, apps/desktop/src/renderer/components/chat/MarkdownRenderer.tsx, apps/desktop/src/renderer/components/chat/MermaidLightbox.tsx, apps/desktop/src/renderer/components/chat/MessageActionBar.tsx, apps/desktop/src/renderer/components/chat/MessageNavRail.tsx, apps/desktop/src/renderer/components/chat/MessageStream.tsx, apps/desktop/src/renderer/components/chat/ModelLightbox.tsx, apps/desktop/src/renderer/components/chat/NewMessageIndicator.tsx, apps/desktop/src/renderer/components/chat/PlanReviewBubble.tsx, apps/desktop/src/renderer/components/chat/PrevMessageJumpChip.tsx, apps/desktop/src/renderer/components/chat/ProjectLinkChip.tsx, apps/desktop/src/renderer/components/chat/QuoteChip.tsx, apps/desktop/src/renderer/components/chat/RewindPreviewDialog.tsx, apps/desktop/src/renderer/components/chat/SelectionQuoteButton.tsx, apps/desktop/src/renderer/components/chat/SentAgentReferenceChip.tsx, apps/desktop/src/renderer/components/chat/SentInlineAtomBody.tsx, apps/desktop/src/renderer/components/chat/SessionHandoffCard.tsx, apps/desktop/src/renderer/components/chat/SessionLinkChip.tsx, apps/desktop/src/renderer/components/chat/ShareMessageCheckbox.tsx, apps/desktop/src/renderer/components/chat/ShareSelectionBar.tsx, apps/desktop/src/renderer/components/chat/SlackIcon.tsx, apps/desktop/src/renderer/components/chat/StreamFadeSpan.tsx, apps/desktop/src/renderer/components/chat/StreamingMarkdownChunk.tsx, apps/desktop/src/renderer/components/chat/SystemCard.tsx, apps/desktop/src/renderer/components/chat/TextLightbox.tsx, apps/desktop/src/renderer/components/chat/ThinkingCard.tsx, apps/desktop/src/renderer/components/chat/ThinkingText.tsx, apps/desktop/src/renderer/components/chat/TodoListCard.tsx, apps/desktop/src/renderer/components/chat/ToolCallCard.tsx, apps/desktop/src/renderer/components/chat/ToolPayloadLightbox.tsx, apps/desktop/src/renderer/components/chat/TopRightChipStack.tsx, apps/desktop/src/renderer/components/chat/TurnChangesCard.tsx, apps/desktop/src/renderer/components/chat/UnreadFailedScheduleBanner.tsx, apps/desktop/src/renderer/components/chat/UpgradeBanner.tsx, apps/desktop/src/renderer/components/chat/UserMessage.tsx, apps/desktop/src/renderer/components/chat/UserMessageEditBox.tsx, apps/desktop/src/renderer/components/chat/UserMessageUrlLink.tsx, apps/desktop/src/renderer/components/chat/VideoLightbox.tsx, apps/desktop/src/renderer/components/chat/WorkGroupBlock.tsx, apps/desktop/src/renderer/components/chat/WorktreeRestoreBanner.tsx, apps/desktop/src/renderer/components/chat/XIcon.tsx, apps/desktop/src/renderer/components/chat/activityRowChrome.ts, apps/desktop/src/renderer/components/chat/autoFollowIntent.ts, apps/desktop/src/renderer/components/chat/chatChrome.ts, apps/desktop/src/renderer/components/chat/errorReasonI18n.ts, apps/desktop/src/renderer/components/chat/imageDisplaySize.ts, apps/desktop/src/renderer/components/chat/lightboxAnnotations.ts, apps/desktop/src/renderer/components/chat/lightboxGestures.ts, apps/desktop/src/renderer/components/chat/markdownImageTargets.ts, apps/desktop/src/renderer/components/chat/messageNavRailModel.ts, apps/desktop/src/renderer/components/chat/messageNavRailWheel.ts, apps/desktop/src/renderer/components/chat/messageStreamIndicatorPosition.ts, apps/desktop/src/renderer/components/chat/messageViewportCompensation.ts, apps/desktop/src/renderer/components/chat/messageWorkGroups.ts, apps/desktop/src/renderer/components/chat/rehypeFencedCodeMarker.ts, apps/desktop/src/renderer/components/chat/rehypeMathBlockMarker.ts, apps/desktop/src/renderer/components/chat/rehypeStreamWordFade.ts, apps/desktop/src/renderer/components/chat/remarkHtmlImages.ts, apps/desktop/src/renderer/components/chat/remarkLocalPathLinks.ts, apps/desktop/src/renderer/components/chat/remarkPreserveRawLocalDestinations.ts, apps/desktop/src/renderer/components/chat/remarkSessionLinks.ts, apps/desktop/src/renderer/components/chat/remarkStrictInlineMath.ts, apps/desktop/src/renderer/components/chat/remarkTruncateCjkUrls.ts, apps/desktop/src/renderer/components/chat/repairStreamingMarkdown.ts, apps/desktop/src/renderer/components/chat/scrollAnchoringDetect.ts, apps/desktop/src/renderer/components/chat/shareSelectionStore.ts, apps/desktop/src/renderer/components/chat/streamingMarkdownBlocks.tsx, apps/desktop/src/renderer/components/chat/streamingMarkdownChunks.ts, apps/desktop/src/renderer/components/chat/toolLoopI18n.ts, apps/desktop/src/renderer/components/chat/unreadCount.ts, apps/desktop/src/renderer/components/chat/useAutomaticHistoryLoadBudget.ts, apps/desktop/src/renderer/components/chat/useCopyAsImage.tsx, apps/desktop/src/renderer/components/chat/useDeleteMessage.ts, apps/desktop/src/renderer/components/chat/useFileChipContextMenu.tsx, apps/desktop/src/renderer/components/chat/useForkAtMessage.ts, apps/desktop/src/renderer/components/chat/useNavigationKeyListener.ts, apps/desktop/src/renderer/components/chat/useOpenWithMenu.tsx, apps/desktop/src/renderer/components/chat/usePrevUserMessageInView.ts, apps/desktop/src/renderer/components/chat/useTurnChangeSets.ts, apps/desktop/src/renderer/components/chat/userMessageCollapse.ts, apps/desktop/src/renderer/components/chat/userMessageDisplayText.ts, apps/desktop/src/renderer/components/chat/userMessageLinkify.ts, apps/desktop/src/renderer/components/chat/viewportFillDetect.ts, apps/desktop/src/renderer/components/new-chat/AddRemoteProjectDialog.tsx, apps/desktop/src/renderer/components/new-chat/AgentSelect.tsx, apps/desktop/src/renderer/components/new-chat/AskUserQuestionPrompt.tsx, apps/desktop/src/renderer/components/new-chat/AtMentionPanel.tsx, apps/desktop/src/renderer/components/new-chat/AttachmentTypeThumb.tsx, apps/desktop/src/renderer/components/new-chat/ChatInput.tsx, apps/desktop/src/renderer/components/new-chat/CjkPunctDecoration.ts, apps/desktop/src/renderer/components/new-chat/CjkPunctuationUtils.ts, apps/desktop/src/renderer/components/new-chat/ComposerListIndentDecoration.ts, apps/desktop/src/renderer/components/new-chat/ComposerListNodes.ts, apps/desktop/src/renderer/components/new-chat/ComposerQuoteNode.tsx, apps/desktop/src/renderer/components/new-chat/DeviceSwitcherPill.tsx, apps/desktop/src/renderer/components/new-chat/EffortSlider.tsx, apps/desktop/src/renderer/components/new-chat/EmptyDocSelectionGuard.ts, apps/desktop/src/renderer/components/new-chat/ExtraDirsButton.tsx, apps/desktop/src/renderer/components/new-chat/FastModeToggle.tsx, apps/desktop/src/renderer/components/new-chat/FolderPickerPopover.tsx, apps/desktop/src/renderer/components/new-chat/FullAccessConfirmContent.tsx, apps/desktop/src/renderer/components/new-chat/GhostCommandDecoration.ts, apps/desktop/src/renderer/components/new-chat/GoalAdvancedLimits.tsx, apps/desktop/src/renderer/components/new-chat/GoalIndicator.tsx, apps/desktop/src/renderer/components/new-chat/HomeUsageDashboard.tsx, apps/desktop/src/renderer/components/new-chat/ListComposerTextarea.tsx, apps/desktop/src/renderer/components/new-chat/MentionChipNode.tsx, apps/desktop/src/renderer/components/new-chat/MentionDragCaretDecoration.ts, apps/desktop/src/renderer/components/new-chat/ModelCompatibilityNotice.tsx, apps/desktop/src/renderer/components/new-chat/ModelConfigFlyout.tsx, apps/desktop/src/renderer/components/new-chat/ModelHarnessPicker.tsx, apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx, apps/desktop/src/renderer/components/new-chat/ModelSourceDetails.tsx, apps/desktop/src/renderer/components/new-chat/NewGoalDialog.tsx, apps/desktop/src/renderer/components/new-chat/PastedTextChipNode.tsx, apps/desktop/src/renderer/components/new-chat/PendingQueuePanel.tsx, apps/desktop/src/renderer/components/new-chat/PermissionPrompt.tsx, apps/desktop/src/renderer/components/new-chat/PermissionSelector.tsx, apps/desktop/src/renderer/components/new-chat/PinnedPlanPanel.tsx, apps/desktop/src/renderer/components/new-chat/PlanActionCard.tsx, apps/desktop/src/renderer/components/new-chat/PlanModeIndicator.tsx, apps/desktop/src/renderer/components/new-chat/PlanViewerCard.tsx, apps/desktop/src/renderer/components/new-chat/PluginSetupPrompt.tsx, apps/desktop/src/renderer/components/new-chat/QuickStartPillMark.ts, apps/desktop/src/renderer/components/new-chat/SendButton.tsx, apps/desktop/src/renderer/components/new-chat/SlashCommandDecoration.ts, apps/desktop/src/renderer/components/new-chat/SlashCommandPalette.tsx, apps/desktop/src/renderer/components/new-chat/TakeoverMask.tsx, apps/desktop/src/renderer/components/new-chat/ThinkingToggle.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedFlyoutHost.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedModelRail.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedModelRow.tsx, apps/desktop/src/renderer/components/new-chat/UsageDailyBars.tsx, apps/desktop/src/renderer/components/new-chat/UsageHeatmap.tsx, apps/desktop/src/renderer/components/new-chat/VendorSegmentedSwitcher.tsx, apps/desktop/src/renderer/components/new-chat/VoiceInputDraftDecoration.ts, apps/desktop/src/renderer/components/new-chat/WindowsSelectionReplacement.ts, apps/desktop/src/renderer/components/new-chat/WorktreeChipsRow.tsx, apps/desktop/src/renderer/components/new-chat/WorktreeCreatingOverlay.tsx, apps/desktop/src/renderer/components/new-chat/agentOptions.ts, apps/desktop/src/renderer/components/new-chat/agentSwitchConfirmation.ts, apps/desktop/src/renderer/components/new-chat/branchPick.ts, apps/desktop/src/renderer/components/new-chat/composerBlankPointerFocus.ts, apps/desktop/src/renderer/components/new-chat/composerContentSerialization.ts, apps/desktop/src/renderer/components/new-chat/composerDocState.ts, apps/desktop/src/renderer/components/new-chat/composerFrameScheduler.ts, apps/desktop/src/renderer/components/new-chat/composerHistoryProjection.ts, apps/desktop/src/renderer/components/new-chat/composerModelSelection.ts, apps/desktop/src/renderer/components/new-chat/composerPromptRecommendation.ts, apps/desktop/src/renderer/components/new-chat/composerRenderGate.ts, apps/desktop/src/renderer/components/new-chat/composerSendOwnership.ts, apps/desktop/src/renderer/components/new-chat/composerSendSnapshot.ts, apps/desktop/src/renderer/components/new-chat/effortChangeQueue.ts, apps/desktop/src/renderer/components/new-chat/extraDirsActions.ts, apps/desktop/src/renderer/components/new-chat/ghostComposerPlacement.ts, apps/desktop/src/renderer/components/new-chat/localAttachmentPicker.ts, apps/desktop/src/renderer/components/new-chat/mentionChipInsertion.ts, apps/desktop/src/renderer/components/new-chat/modelWindowErrorToast.ts, apps/desktop/src/renderer/components/new-chat/pastePipeline.ts, apps/desktop/src/renderer/components/new-chat/pathPaste.ts, apps/desktop/src/renderer/components/new-chat/pendingQueueLocks.ts, apps/desktop/src/renderer/components/new-chat/pendingQueueRowActivity.ts, apps/desktop/src/renderer/components/new-chat/pendingQueueRowPresentation.ts, apps/desktop/src/renderer/components/new-chat/planModeComposerCommand.ts, apps/desktop/src/renderer/components/new-chat/priceTierMarks.tsx, apps/desktop/src/renderer/components/new-chat/remoteBrowseAdapters.ts, apps/desktop/src/renderer/components/new-chat/remoteExistingProjects.ts, apps/desktop/src/renderer/components/new-chat/sessionLinkPaste.ts, apps/desktop/src/renderer/components/new-chat/sourceSwitch.ts, apps/desktop/src/renderer/components/new-chat/unifiedModelSelection.ts, apps/desktop/src/renderer/components/new-chat/usagePalette.ts, apps/desktop/src/renderer/components/new-chat/useComposerSendFocusRestore.ts, apps/desktop/src/renderer/components/new-chat/useModelDiscoveryPending.ts, apps/desktop/src/renderer/components/new-chat/useProviderWeeklyQuota.ts, apps/desktop/src/renderer/components/new-chat/useUnifiedRowActions.ts, apps/desktop/src/renderer/features/cc-agent/CCAgentFeatureLayout.tsx, apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx, apps/desktop/src/renderer/features/cc-agent/OrcaSplitView.tsx, apps/desktop/src/renderer/features/cc-agent/OrcaWorkerPanel.tsx, apps/desktop/src/renderer/features/cc-agent/OrcaWorkflowRoute.tsx | 273 | 46 | 408 |
| `desktop.chat.scheduled` | desktop | 调度任务列表 | hash `/cc-agent/scheduled`(SchedulerPage) | SchedulerPage | apps/desktop/src/renderer/features/scheduler/SchedulerPage.tsx, apps/desktop/src/renderer/features/scheduler/components/AgentMark.tsx, apps/desktop/src/renderer/features/scheduler/components/BoundSessionCard.tsx, apps/desktop/src/renderer/features/scheduler/components/ProjectAutomationNotifyBridge.tsx, apps/desktop/src/renderer/features/scheduler/components/RunHistoryCard.tsx, apps/desktop/src/renderer/features/scheduler/components/RunHistoryPane.tsx, apps/desktop/src/renderer/features/scheduler/components/ScheduleChips.tsx, apps/desktop/src/renderer/features/scheduler/components/ScheduleFormDialog.tsx, apps/desktop/src/renderer/features/scheduler/components/ScheduleSessionIndexOwner.tsx, apps/desktop/src/renderer/features/scheduler/components/ScheduleStatusChip.tsx, apps/desktop/src/renderer/features/scheduler/components/ScriptCapabilityMultiSelect.tsx, apps/desktop/src/renderer/features/scheduler/components/TaskListCell.tsx, apps/desktop/src/renderer/features/scheduler/components/TaskListFilterPopover.tsx, apps/desktop/src/renderer/features/scheduler/components/TaskListPane.tsx, apps/desktop/src/renderer/features/scheduler/components/TemplateCard.tsx, apps/desktop/src/renderer/features/scheduler/components/TemplateGallery.tsx, apps/desktop/src/renderer/features/scheduler/components/TemplateParamForm.tsx, apps/desktop/src/renderer/features/scheduler/hooks/useDeleteScheduleWithSessions.tsx, apps/desktop/src/renderer/features/scheduler/hooks/useReadFailedScheduleRuns.ts, apps/desktop/src/renderer/features/scheduler/hooks/useRunNowBusyGuard.ts, apps/desktop/src/renderer/features/scheduler/hooks/useRuns.ts, apps/desktop/src/renderer/features/scheduler/hooks/useScheduleForm.ts, apps/desktop/src/renderer/features/scheduler/hooks/useScheduleUnreadRunCounts.ts, apps/desktop/src/renderer/features/scheduler/hooks/useSchedules.ts, apps/desktop/src/renderer/features/scheduler/hooks/useSessionReferences.ts, apps/desktop/src/renderer/features/scheduler/hooks/useTemplates.ts, apps/desktop/src/renderer/features/scheduler/index.ts, apps/desktop/src/renderer/features/scheduler/lib/cronCodexPreset.ts, apps/desktop/src/renderer/features/scheduler/lib/cronToHuman.ts, apps/desktop/src/renderer/features/scheduler/lib/failedScheduleDismissal.ts, apps/desktop/src/renderer/features/scheduler/lib/formatters.ts, apps/desktop/src/renderer/features/scheduler/lib/pluginScheduleCreateIntent.ts, apps/desktop/src/renderer/features/scheduler/lib/projectAutomationConfig.ts, apps/desktop/src/renderer/features/scheduler/lib/projectScheduleSidebarIndex.ts, apps/desktop/src/renderer/features/scheduler/lib/runHistoryGrouping.ts, apps/desktop/src/renderer/features/scheduler/lib/runUnread.ts, apps/desktop/src/renderer/features/scheduler/lib/scheduleFormLogic.ts, apps/desktop/src/renderer/features/scheduler/lib/scheduleRunReadSync.ts, apps/desktop/src/renderer/features/scheduler/lib/scheduleSessionBinding.ts, apps/desktop/src/renderer/features/scheduler/lib/scheduleSidebarIndexRuns.ts, apps/desktop/src/renderer/features/scheduler/lib/schedulesStore.ts, apps/desktop/src/renderer/features/scheduler/lib/statusFilter.ts, apps/desktop/src/renderer/features/scheduler/lib/statusFilterStorage.ts, apps/desktop/src/renderer/features/scheduler/lib/templateLocalization.ts, apps/desktop/src/renderer/features/scheduler/lib/usageLimitScheduleCreateIntent.ts | 44 | 0 | 118 |
-| `desktop.chat.session` | desktop | 会话工作台 | hash `/cc-agent/:sessionId`;副窗经 `/cc-agent/boot` 解析后落到同一会话视图 | AssistantMessage, CCAgentFeatureLayout, CCAgentSessionView, ChatInput, PermissionPrompt | apps/desktop/src/renderer/components/chat/AgentActionRow.tsx, apps/desktop/src/renderer/components/chat/AgentActionsBlock.tsx, apps/desktop/src/renderer/components/chat/AgentTaskCard.tsx, apps/desktop/src/renderer/components/chat/AskUserQuestionBubble.tsx, apps/desktop/src/renderer/components/chat/AssistantMessage.tsx, apps/desktop/src/renderer/components/chat/AutomationOriginBadge.tsx, apps/desktop/src/renderer/components/chat/ChatAudioCard.tsx, apps/desktop/src/renderer/components/chat/ChatDisplaySnapshotContext.tsx, apps/desktop/src/renderer/components/chat/ChatImageView.tsx, apps/desktop/src/renderer/components/chat/ChatSessionFileContext.tsx, apps/desktop/src/renderer/components/chat/ChatSoundEffectCard.tsx, apps/desktop/src/renderer/components/chat/ChatVideoView.tsx, apps/desktop/src/renderer/components/chat/CindyMakeCommandDialog.tsx, apps/desktop/src/renderer/components/chat/CindyMakeDoctorCard.tsx, apps/desktop/src/renderer/components/chat/CopyAsImageBlock.tsx, apps/desktop/src/renderer/components/chat/CredentialSwitchWaitBanner.tsx, apps/desktop/src/renderer/components/chat/DiffView.tsx, apps/desktop/src/renderer/components/chat/ErrorBanner.tsx, apps/desktop/src/renderer/components/chat/ErrorMessageCard.tsx, apps/desktop/src/renderer/components/chat/GeneratedFilesCard.tsx, apps/desktop/src/renderer/components/chat/GhostSummonCard.tsx, apps/desktop/src/renderer/components/chat/GhostToolCard.tsx, apps/desktop/src/renderer/components/chat/HookTaskCard.tsx, apps/desktop/src/renderer/components/chat/ImageGalleryContext.tsx, apps/desktop/src/renderer/components/chat/ImageHoverPreview.tsx, apps/desktop/src/renderer/components/chat/ImageLightbox.tsx, apps/desktop/src/renderer/components/chat/ImageMissingPlaceholder.tsx, apps/desktop/src/renderer/components/chat/InlineReferenceChip.tsx, apps/desktop/src/renderer/components/chat/InterruptedTurnBanner.tsx, apps/desktop/src/renderer/components/chat/JumpToBottomChip.tsx, apps/desktop/src/renderer/components/chat/MarkdownDiffBlock.tsx, apps/desktop/src/renderer/components/chat/MarkdownMermaidBlock.tsx, apps/desktop/src/renderer/components/chat/MarkdownRenderer.tsx, apps/desktop/src/renderer/components/chat/MermaidLightbox.tsx, apps/desktop/src/renderer/components/chat/MessageActionBar.tsx, apps/desktop/src/renderer/components/chat/MessageNavRail.tsx, apps/desktop/src/renderer/components/chat/MessageStream.tsx, apps/desktop/src/renderer/components/chat/ModelLightbox.tsx, apps/desktop/src/renderer/components/chat/NewMessageIndicator.tsx, apps/desktop/src/renderer/components/chat/PlanReviewBubble.tsx, apps/desktop/src/renderer/components/chat/PrevMessageJumpChip.tsx, apps/desktop/src/renderer/components/chat/ProjectLinkChip.tsx, apps/desktop/src/renderer/components/chat/QuoteChip.tsx, apps/desktop/src/renderer/components/chat/RewindPreviewDialog.tsx, apps/desktop/src/renderer/components/chat/SelectionQuoteButton.tsx, apps/desktop/src/renderer/components/chat/SentAgentReferenceChip.tsx, apps/desktop/src/renderer/components/chat/SentInlineAtomBody.tsx, apps/desktop/src/renderer/components/chat/SessionHandoffCard.tsx, apps/desktop/src/renderer/components/chat/SessionLinkChip.tsx, apps/desktop/src/renderer/components/chat/ShareMessageCheckbox.tsx, apps/desktop/src/renderer/components/chat/ShareSelectionBar.tsx, apps/desktop/src/renderer/components/chat/SlackIcon.tsx, apps/desktop/src/renderer/components/chat/StreamFadeSpan.tsx, apps/desktop/src/renderer/components/chat/StreamingMarkdownChunk.tsx, apps/desktop/src/renderer/components/chat/SystemCard.tsx, apps/desktop/src/renderer/components/chat/TextLightbox.tsx, apps/desktop/src/renderer/components/chat/ThinkingCard.tsx, apps/desktop/src/renderer/components/chat/ThinkingText.tsx, apps/desktop/src/renderer/components/chat/TodoListCard.tsx, apps/desktop/src/renderer/components/chat/ToolCallCard.tsx, apps/desktop/src/renderer/components/chat/ToolPayloadLightbox.tsx, apps/desktop/src/renderer/components/chat/TopRightChipStack.tsx, apps/desktop/src/renderer/components/chat/TurnChangesCard.tsx, apps/desktop/src/renderer/components/chat/UnreadFailedScheduleBanner.tsx, apps/desktop/src/renderer/components/chat/UpgradeBanner.tsx, apps/desktop/src/renderer/components/chat/UserMessage.tsx, apps/desktop/src/renderer/components/chat/UserMessageEditBox.tsx, apps/desktop/src/renderer/components/chat/UserMessageUrlLink.tsx, apps/desktop/src/renderer/components/chat/VideoLightbox.tsx, apps/desktop/src/renderer/components/chat/WorkGroupBlock.tsx, apps/desktop/src/renderer/components/chat/WorktreeRestoreBanner.tsx, apps/desktop/src/renderer/components/chat/XIcon.tsx, apps/desktop/src/renderer/components/chat/activityRowChrome.ts, apps/desktop/src/renderer/components/chat/autoFollowIntent.ts, apps/desktop/src/renderer/components/chat/chatChrome.ts, apps/desktop/src/renderer/components/chat/errorReasonI18n.ts, apps/desktop/src/renderer/components/chat/imageDisplaySize.ts, apps/desktop/src/renderer/components/chat/lightboxAnnotations.ts, apps/desktop/src/renderer/components/chat/lightboxGestures.ts, apps/desktop/src/renderer/components/chat/markdownImageTargets.ts, apps/desktop/src/renderer/components/chat/messageNavRailModel.ts, apps/desktop/src/renderer/components/chat/messageNavRailWheel.ts, apps/desktop/src/renderer/components/chat/messageStreamIndicatorPosition.ts, apps/desktop/src/renderer/components/chat/messageViewportCompensation.ts, apps/desktop/src/renderer/components/chat/messageWorkGroups.ts, apps/desktop/src/renderer/components/chat/rehypeFencedCodeMarker.ts, apps/desktop/src/renderer/components/chat/rehypeMathBlockMarker.ts, apps/desktop/src/renderer/components/chat/rehypeStreamWordFade.ts, apps/desktop/src/renderer/components/chat/remarkHtmlImages.ts, apps/desktop/src/renderer/components/chat/remarkLocalPathLinks.ts, apps/desktop/src/renderer/components/chat/remarkPreserveRawLocalDestinations.ts, apps/desktop/src/renderer/components/chat/remarkSessionLinks.ts, apps/desktop/src/renderer/components/chat/remarkStrictInlineMath.ts, apps/desktop/src/renderer/components/chat/remarkTruncateCjkUrls.ts, apps/desktop/src/renderer/components/chat/repairStreamingMarkdown.ts, apps/desktop/src/renderer/components/chat/scrollAnchoringDetect.ts, apps/desktop/src/renderer/components/chat/shareSelectionStore.ts, apps/desktop/src/renderer/components/chat/streamingMarkdownBlocks.tsx, apps/desktop/src/renderer/components/chat/streamingMarkdownChunks.ts, apps/desktop/src/renderer/components/chat/toolLoopI18n.ts, apps/desktop/src/renderer/components/chat/unreadCount.ts, apps/desktop/src/renderer/components/chat/useAutomaticHistoryLoadBudget.ts, apps/desktop/src/renderer/components/chat/useCopyAsImage.tsx, apps/desktop/src/renderer/components/chat/useDeleteMessage.ts, apps/desktop/src/renderer/components/chat/useFileChipContextMenu.tsx, apps/desktop/src/renderer/components/chat/useForkAtMessage.ts, apps/desktop/src/renderer/components/chat/useNavigationKeyListener.ts, apps/desktop/src/renderer/components/chat/useOpenWithMenu.tsx, apps/desktop/src/renderer/components/chat/usePrevUserMessageInView.ts, apps/desktop/src/renderer/components/chat/useTurnChangeSets.ts, apps/desktop/src/renderer/components/chat/userMessageCollapse.ts, apps/desktop/src/renderer/components/chat/userMessageDisplayText.ts, apps/desktop/src/renderer/components/chat/userMessageLinkify.ts, apps/desktop/src/renderer/components/chat/viewportFillDetect.ts, apps/desktop/src/renderer/components/new-chat/AddRemoteProjectDialog.tsx, apps/desktop/src/renderer/components/new-chat/AgentSelect.tsx, apps/desktop/src/renderer/components/new-chat/AskUserQuestionPrompt.tsx, apps/desktop/src/renderer/components/new-chat/AtMentionPanel.tsx, apps/desktop/src/renderer/components/new-chat/AttachmentTypeThumb.tsx, apps/desktop/src/renderer/components/new-chat/ChatInput.tsx, apps/desktop/src/renderer/components/new-chat/CjkPunctDecoration.ts, apps/desktop/src/renderer/components/new-chat/CjkPunctuationUtils.ts, apps/desktop/src/renderer/components/new-chat/ComposerListIndentDecoration.ts, apps/desktop/src/renderer/components/new-chat/ComposerListNodes.ts, apps/desktop/src/renderer/components/new-chat/ComposerQuoteNode.tsx, apps/desktop/src/renderer/components/new-chat/DeviceSwitcherPill.tsx, apps/desktop/src/renderer/components/new-chat/EffortSlider.tsx, apps/desktop/src/renderer/components/new-chat/EmptyDocSelectionGuard.ts, apps/desktop/src/renderer/components/new-chat/ExtraDirsButton.tsx, apps/desktop/src/renderer/components/new-chat/FastModeToggle.tsx, apps/desktop/src/renderer/components/new-chat/FolderPickerPopover.tsx, apps/desktop/src/renderer/components/new-chat/FullAccessConfirmContent.tsx, apps/desktop/src/renderer/components/new-chat/GhostCommandDecoration.ts, apps/desktop/src/renderer/components/new-chat/GoalAdvancedLimits.tsx, apps/desktop/src/renderer/components/new-chat/GoalIndicator.tsx, apps/desktop/src/renderer/components/new-chat/HomeUsageDashboard.tsx, apps/desktop/src/renderer/components/new-chat/ListComposerTextarea.tsx, apps/desktop/src/renderer/components/new-chat/MentionChipNode.tsx, apps/desktop/src/renderer/components/new-chat/MentionDragCaretDecoration.ts, apps/desktop/src/renderer/components/new-chat/ModelCompatibilityNotice.tsx, apps/desktop/src/renderer/components/new-chat/ModelConfigFlyout.tsx, apps/desktop/src/renderer/components/new-chat/ModelHarnessPicker.tsx, apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx, apps/desktop/src/renderer/components/new-chat/ModelSourceDetails.tsx, apps/desktop/src/renderer/components/new-chat/NewGoalDialog.tsx, apps/desktop/src/renderer/components/new-chat/PastedTextChipNode.tsx, apps/desktop/src/renderer/components/new-chat/PendingQueuePanel.tsx, apps/desktop/src/renderer/components/new-chat/PermissionPrompt.tsx, apps/desktop/src/renderer/components/new-chat/PermissionSelector.tsx, apps/desktop/src/renderer/components/new-chat/PinnedPlanPanel.tsx, apps/desktop/src/renderer/components/new-chat/PlanActionCard.tsx, apps/desktop/src/renderer/components/new-chat/PlanModeIndicator.tsx, apps/desktop/src/renderer/components/new-chat/PlanViewerCard.tsx, apps/desktop/src/renderer/components/new-chat/PluginSetupPrompt.tsx, apps/desktop/src/renderer/components/new-chat/QuickStartPillMark.ts, apps/desktop/src/renderer/components/new-chat/SendButton.tsx, apps/desktop/src/renderer/components/new-chat/SlashCommandDecoration.ts, apps/desktop/src/renderer/components/new-chat/SlashCommandPalette.tsx, apps/desktop/src/renderer/components/new-chat/TakeoverMask.tsx, apps/desktop/src/renderer/components/new-chat/ThinkingToggle.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedFlyoutHost.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedModelRail.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedModelRow.tsx, apps/desktop/src/renderer/components/new-chat/UsageDailyBars.tsx, apps/desktop/src/renderer/components/new-chat/UsageHeatmap.tsx, apps/desktop/src/renderer/components/new-chat/VendorSegmentedSwitcher.tsx, apps/desktop/src/renderer/components/new-chat/VoiceInputDraftDecoration.ts, apps/desktop/src/renderer/components/new-chat/WindowsSelectionReplacement.ts, apps/desktop/src/renderer/components/new-chat/WorktreeChipsRow.tsx, apps/desktop/src/renderer/components/new-chat/WorktreeCreatingOverlay.tsx, apps/desktop/src/renderer/components/new-chat/agentOptions.ts, apps/desktop/src/renderer/components/new-chat/agentSwitchConfirmation.ts, apps/desktop/src/renderer/components/new-chat/branchPick.ts, apps/desktop/src/renderer/components/new-chat/composerBlankPointerFocus.ts, apps/desktop/src/renderer/components/new-chat/composerContentSerialization.ts, apps/desktop/src/renderer/components/new-chat/composerDocState.ts, apps/desktop/src/renderer/components/new-chat/composerFrameScheduler.ts, apps/desktop/src/renderer/components/new-chat/composerHistoryProjection.ts, apps/desktop/src/renderer/components/new-chat/composerModelSelection.ts, apps/desktop/src/renderer/components/new-chat/composerPromptRecommendation.ts, apps/desktop/src/renderer/components/new-chat/composerRenderGate.ts, apps/desktop/src/renderer/components/new-chat/composerSendOwnership.ts, apps/desktop/src/renderer/components/new-chat/composerSendSnapshot.ts, apps/desktop/src/renderer/components/new-chat/effortChangeQueue.ts, apps/desktop/src/renderer/components/new-chat/extraDirsActions.ts, apps/desktop/src/renderer/components/new-chat/ghostComposerPlacement.ts, apps/desktop/src/renderer/components/new-chat/localAttachmentPicker.ts, apps/desktop/src/renderer/components/new-chat/mentionChipInsertion.ts, apps/desktop/src/renderer/components/new-chat/modelWindowErrorToast.ts, apps/desktop/src/renderer/components/new-chat/pastePipeline.ts, apps/desktop/src/renderer/components/new-chat/pathPaste.ts, apps/desktop/src/renderer/components/new-chat/pendingQueueLocks.ts, apps/desktop/src/renderer/components/new-chat/pendingQueueRowActivity.ts, apps/desktop/src/renderer/components/new-chat/pendingQueueRowPresentation.ts, apps/desktop/src/renderer/components/new-chat/planModeComposerCommand.ts, apps/desktop/src/renderer/components/new-chat/priceTierMarks.tsx, apps/desktop/src/renderer/components/new-chat/remoteBrowseAdapters.ts, apps/desktop/src/renderer/components/new-chat/remoteExistingProjects.ts, apps/desktop/src/renderer/components/new-chat/sessionLinkPaste.ts, apps/desktop/src/renderer/components/new-chat/sourceSwitch.ts, apps/desktop/src/renderer/components/new-chat/unifiedModelSelection.ts, apps/desktop/src/renderer/components/new-chat/usagePalette.ts, apps/desktop/src/renderer/components/new-chat/useComposerSendFocusRestore.ts, apps/desktop/src/renderer/components/new-chat/useModelDiscoveryPending.ts, apps/desktop/src/renderer/components/new-chat/useProviderWeeklyQuota.ts, apps/desktop/src/renderer/components/new-chat/useUnifiedRowActions.ts, apps/desktop/src/renderer/features/cc-agent/CCAgentFeatureLayout.tsx, apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx | 273 | 46 | 409 |
+| `desktop.chat.session` | desktop | 会话工作台 | hash `/cc-agent/:sessionId`;副窗经 `/cc-agent/boot` 解析后落到同一会话视图 | AssistantMessage, CCAgentFeatureLayout, CCAgentSessionView, ChatInput, PermissionPrompt | apps/desktop/src/renderer/components/chat/AgentActionRow.tsx, apps/desktop/src/renderer/components/chat/AgentActionsBlock.tsx, apps/desktop/src/renderer/components/chat/AgentTaskCard.tsx, apps/desktop/src/renderer/components/chat/AskUserQuestionBubble.tsx, apps/desktop/src/renderer/components/chat/AssistantMessage.tsx, apps/desktop/src/renderer/components/chat/AutomationOriginBadge.tsx, apps/desktop/src/renderer/components/chat/ChatAudioCard.tsx, apps/desktop/src/renderer/components/chat/ChatDisplaySnapshotContext.tsx, apps/desktop/src/renderer/components/chat/ChatImageView.tsx, apps/desktop/src/renderer/components/chat/ChatSessionFileContext.tsx, apps/desktop/src/renderer/components/chat/ChatSoundEffectCard.tsx, apps/desktop/src/renderer/components/chat/ChatVideoView.tsx, apps/desktop/src/renderer/components/chat/CindyMakeDoctorCard.tsx, apps/desktop/src/renderer/components/chat/CopyAsImageBlock.tsx, apps/desktop/src/renderer/components/chat/CredentialSwitchWaitBanner.tsx, apps/desktop/src/renderer/components/chat/DiffView.tsx, apps/desktop/src/renderer/components/chat/ErrorBanner.tsx, apps/desktop/src/renderer/components/chat/ErrorMessageCard.tsx, apps/desktop/src/renderer/components/chat/GeneratedFilesCard.tsx, apps/desktop/src/renderer/components/chat/GhostSummonCard.tsx, apps/desktop/src/renderer/components/chat/GhostToolCard.tsx, apps/desktop/src/renderer/components/chat/HookTaskCard.tsx, apps/desktop/src/renderer/components/chat/ImageGalleryContext.tsx, apps/desktop/src/renderer/components/chat/ImageHoverPreview.tsx, apps/desktop/src/renderer/components/chat/ImageLightbox.tsx, apps/desktop/src/renderer/components/chat/ImageMissingPlaceholder.tsx, apps/desktop/src/renderer/components/chat/InlineReferenceChip.tsx, apps/desktop/src/renderer/components/chat/InterruptedTurnBanner.tsx, apps/desktop/src/renderer/components/chat/JumpToBottomChip.tsx, apps/desktop/src/renderer/components/chat/MarkdownDiffBlock.tsx, apps/desktop/src/renderer/components/chat/MarkdownMermaidBlock.tsx, apps/desktop/src/renderer/components/chat/MarkdownRenderer.tsx, apps/desktop/src/renderer/components/chat/MermaidLightbox.tsx, apps/desktop/src/renderer/components/chat/MessageActionBar.tsx, apps/desktop/src/renderer/components/chat/MessageNavRail.tsx, apps/desktop/src/renderer/components/chat/MessageStream.tsx, apps/desktop/src/renderer/components/chat/ModelLightbox.tsx, apps/desktop/src/renderer/components/chat/NewMessageIndicator.tsx, apps/desktop/src/renderer/components/chat/PlanReviewBubble.tsx, apps/desktop/src/renderer/components/chat/PrevMessageJumpChip.tsx, apps/desktop/src/renderer/components/chat/ProjectLinkChip.tsx, apps/desktop/src/renderer/components/chat/QuoteChip.tsx, apps/desktop/src/renderer/components/chat/RewindPreviewDialog.tsx, apps/desktop/src/renderer/components/chat/SelectionQuoteButton.tsx, apps/desktop/src/renderer/components/chat/SentAgentReferenceChip.tsx, apps/desktop/src/renderer/components/chat/SentInlineAtomBody.tsx, apps/desktop/src/renderer/components/chat/SessionHandoffCard.tsx, apps/desktop/src/renderer/components/chat/SessionLinkChip.tsx, apps/desktop/src/renderer/components/chat/ShareMessageCheckbox.tsx, apps/desktop/src/renderer/components/chat/ShareSelectionBar.tsx, apps/desktop/src/renderer/components/chat/SlackIcon.tsx, apps/desktop/src/renderer/components/chat/StreamFadeSpan.tsx, apps/desktop/src/renderer/components/chat/StreamingMarkdownChunk.tsx, apps/desktop/src/renderer/components/chat/SystemCard.tsx, apps/desktop/src/renderer/components/chat/TextLightbox.tsx, apps/desktop/src/renderer/components/chat/ThinkingCard.tsx, apps/desktop/src/renderer/components/chat/ThinkingText.tsx, apps/desktop/src/renderer/components/chat/TodoListCard.tsx, apps/desktop/src/renderer/components/chat/ToolCallCard.tsx, apps/desktop/src/renderer/components/chat/ToolPayloadLightbox.tsx, apps/desktop/src/renderer/components/chat/TopRightChipStack.tsx, apps/desktop/src/renderer/components/chat/TurnChangesCard.tsx, apps/desktop/src/renderer/components/chat/UnreadFailedScheduleBanner.tsx, apps/desktop/src/renderer/components/chat/UpgradeBanner.tsx, apps/desktop/src/renderer/components/chat/UserMessage.tsx, apps/desktop/src/renderer/components/chat/UserMessageEditBox.tsx, apps/desktop/src/renderer/components/chat/UserMessageUrlLink.tsx, apps/desktop/src/renderer/components/chat/VideoLightbox.tsx, apps/desktop/src/renderer/components/chat/WorkGroupBlock.tsx, apps/desktop/src/renderer/components/chat/WorktreeRestoreBanner.tsx, apps/desktop/src/renderer/components/chat/XIcon.tsx, apps/desktop/src/renderer/components/chat/activityRowChrome.ts, apps/desktop/src/renderer/components/chat/autoFollowIntent.ts, apps/desktop/src/renderer/components/chat/chatChrome.ts, apps/desktop/src/renderer/components/chat/errorReasonI18n.ts, apps/desktop/src/renderer/components/chat/imageDisplaySize.ts, apps/desktop/src/renderer/components/chat/lightboxAnnotations.ts, apps/desktop/src/renderer/components/chat/lightboxGestures.ts, apps/desktop/src/renderer/components/chat/markdownImageTargets.ts, apps/desktop/src/renderer/components/chat/messageNavRailModel.ts, apps/desktop/src/renderer/components/chat/messageNavRailWheel.ts, apps/desktop/src/renderer/components/chat/messageStreamIndicatorPosition.ts, apps/desktop/src/renderer/components/chat/messageViewportCompensation.ts, apps/desktop/src/renderer/components/chat/messageWorkGroups.ts, apps/desktop/src/renderer/components/chat/rehypeFencedCodeMarker.ts, apps/desktop/src/renderer/components/chat/rehypeMathBlockMarker.ts, apps/desktop/src/renderer/components/chat/rehypeStreamWordFade.ts, apps/desktop/src/renderer/components/chat/remarkHtmlImages.ts, apps/desktop/src/renderer/components/chat/remarkLocalPathLinks.ts, apps/desktop/src/renderer/components/chat/remarkPreserveRawLocalDestinations.ts, apps/desktop/src/renderer/components/chat/remarkSessionLinks.ts, apps/desktop/src/renderer/components/chat/remarkStrictInlineMath.ts, apps/desktop/src/renderer/components/chat/remarkTruncateCjkUrls.ts, apps/desktop/src/renderer/components/chat/repairStreamingMarkdown.ts, apps/desktop/src/renderer/components/chat/scrollAnchoringDetect.ts, apps/desktop/src/renderer/components/chat/shareSelectionStore.ts, apps/desktop/src/renderer/components/chat/streamingMarkdownBlocks.tsx, apps/desktop/src/renderer/components/chat/streamingMarkdownChunks.ts, apps/desktop/src/renderer/components/chat/toolLoopI18n.ts, apps/desktop/src/renderer/components/chat/unreadCount.ts, apps/desktop/src/renderer/components/chat/useAutomaticHistoryLoadBudget.ts, apps/desktop/src/renderer/components/chat/useCopyAsImage.tsx, apps/desktop/src/renderer/components/chat/useDeleteMessage.ts, apps/desktop/src/renderer/components/chat/useFileChipContextMenu.tsx, apps/desktop/src/renderer/components/chat/useForkAtMessage.ts, apps/desktop/src/renderer/components/chat/useNavigationKeyListener.ts, apps/desktop/src/renderer/components/chat/useOpenWithMenu.tsx, apps/desktop/src/renderer/components/chat/usePrevUserMessageInView.ts, apps/desktop/src/renderer/components/chat/useTurnChangeSets.ts, apps/desktop/src/renderer/components/chat/userMessageCollapse.ts, apps/desktop/src/renderer/components/chat/userMessageDisplayText.ts, apps/desktop/src/renderer/components/chat/userMessageLinkify.ts, apps/desktop/src/renderer/components/chat/viewportFillDetect.ts, apps/desktop/src/renderer/components/new-chat/AddRemoteProjectDialog.tsx, apps/desktop/src/renderer/components/new-chat/AgentSelect.tsx, apps/desktop/src/renderer/components/new-chat/AskUserQuestionPrompt.tsx, apps/desktop/src/renderer/components/new-chat/AtMentionPanel.tsx, apps/desktop/src/renderer/components/new-chat/AttachmentTypeThumb.tsx, apps/desktop/src/renderer/components/new-chat/ChatInput.tsx, apps/desktop/src/renderer/components/new-chat/CjkPunctDecoration.ts, apps/desktop/src/renderer/components/new-chat/CjkPunctuationUtils.ts, apps/desktop/src/renderer/components/new-chat/ComposerListIndentDecoration.ts, apps/desktop/src/renderer/components/new-chat/ComposerListNodes.ts, apps/desktop/src/renderer/components/new-chat/ComposerQuoteNode.tsx, apps/desktop/src/renderer/components/new-chat/DeviceSwitcherPill.tsx, apps/desktop/src/renderer/components/new-chat/EffortSlider.tsx, apps/desktop/src/renderer/components/new-chat/EmptyDocSelectionGuard.ts, apps/desktop/src/renderer/components/new-chat/ExtraDirsButton.tsx, apps/desktop/src/renderer/components/new-chat/FastModeToggle.tsx, apps/desktop/src/renderer/components/new-chat/FolderPickerPopover.tsx, apps/desktop/src/renderer/components/new-chat/FullAccessConfirmContent.tsx, apps/desktop/src/renderer/components/new-chat/GhostCommandDecoration.ts, apps/desktop/src/renderer/components/new-chat/GoalAdvancedLimits.tsx, apps/desktop/src/renderer/components/new-chat/GoalIndicator.tsx, apps/desktop/src/renderer/components/new-chat/HomeUsageDashboard.tsx, apps/desktop/src/renderer/components/new-chat/ListComposerTextarea.tsx, apps/desktop/src/renderer/components/new-chat/MentionChipNode.tsx, apps/desktop/src/renderer/components/new-chat/MentionDragCaretDecoration.ts, apps/desktop/src/renderer/components/new-chat/ModelCompatibilityNotice.tsx, apps/desktop/src/renderer/components/new-chat/ModelConfigFlyout.tsx, apps/desktop/src/renderer/components/new-chat/ModelHarnessPicker.tsx, apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx, apps/desktop/src/renderer/components/new-chat/ModelSourceDetails.tsx, apps/desktop/src/renderer/components/new-chat/NewGoalDialog.tsx, apps/desktop/src/renderer/components/new-chat/PastedTextChipNode.tsx, apps/desktop/src/renderer/components/new-chat/PendingQueuePanel.tsx, apps/desktop/src/renderer/components/new-chat/PermissionPrompt.tsx, apps/desktop/src/renderer/components/new-chat/PermissionSelector.tsx, apps/desktop/src/renderer/components/new-chat/PinnedPlanPanel.tsx, apps/desktop/src/renderer/components/new-chat/PlanActionCard.tsx, apps/desktop/src/renderer/components/new-chat/PlanModeIndicator.tsx, apps/desktop/src/renderer/components/new-chat/PlanViewerCard.tsx, apps/desktop/src/renderer/components/new-chat/PluginSetupPrompt.tsx, apps/desktop/src/renderer/components/new-chat/QuickStartPillMark.ts, apps/desktop/src/renderer/components/new-chat/SendButton.tsx, apps/desktop/src/renderer/components/new-chat/SlashCommandDecoration.ts, apps/desktop/src/renderer/components/new-chat/SlashCommandPalette.tsx, apps/desktop/src/renderer/components/new-chat/TakeoverMask.tsx, apps/desktop/src/renderer/components/new-chat/ThinkingToggle.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedFlyoutHost.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedModelRail.tsx, apps/desktop/src/renderer/components/new-chat/UnifiedModelRow.tsx, apps/desktop/src/renderer/components/new-chat/UsageDailyBars.tsx, apps/desktop/src/renderer/components/new-chat/UsageHeatmap.tsx, apps/desktop/src/renderer/components/new-chat/VendorSegmentedSwitcher.tsx, apps/desktop/src/renderer/components/new-chat/VoiceInputDraftDecoration.ts, apps/desktop/src/renderer/components/new-chat/WindowsSelectionReplacement.ts, apps/desktop/src/renderer/components/new-chat/WorktreeChipsRow.tsx, apps/desktop/src/renderer/components/new-chat/WorktreeCreatingOverlay.tsx, apps/desktop/src/renderer/components/new-chat/agentOptions.ts, apps/desktop/src/renderer/components/new-chat/agentSwitchConfirmation.ts, apps/desktop/src/renderer/components/new-chat/branchPick.ts, apps/desktop/src/renderer/components/new-chat/composerBlankPointerFocus.ts, apps/desktop/src/renderer/components/new-chat/composerContentSerialization.ts, apps/desktop/src/renderer/components/new-chat/composerDocState.ts, apps/desktop/src/renderer/components/new-chat/composerFrameScheduler.ts, apps/desktop/src/renderer/components/new-chat/composerHistoryProjection.ts, apps/desktop/src/renderer/components/new-chat/composerModelSelection.ts, apps/desktop/src/renderer/components/new-chat/composerPromptRecommendation.ts, apps/desktop/src/renderer/components/new-chat/composerRenderGate.ts, apps/desktop/src/renderer/components/new-chat/composerSendOwnership.ts, apps/desktop/src/renderer/components/new-chat/composerSendSnapshot.ts, apps/desktop/src/renderer/components/new-chat/effortChangeQueue.ts, apps/desktop/src/renderer/components/new-chat/extraDirsActions.ts, apps/desktop/src/renderer/components/new-chat/ghostComposerPlacement.ts, apps/desktop/src/renderer/components/new-chat/localAttachmentPicker.ts, apps/desktop/src/renderer/components/new-chat/mentionChipInsertion.ts, apps/desktop/src/renderer/components/new-chat/modelWindowErrorToast.ts, apps/desktop/src/renderer/components/new-chat/pastePipeline.ts, apps/desktop/src/renderer/components/new-chat/pathPaste.ts, apps/desktop/src/renderer/components/new-chat/pendingQueueLocks.ts, apps/desktop/src/renderer/components/new-chat/pendingQueueRowActivity.ts, apps/desktop/src/renderer/components/new-chat/pendingQueueRowPresentation.ts, apps/desktop/src/renderer/components/new-chat/planModeComposerCommand.ts, apps/desktop/src/renderer/components/new-chat/priceTierMarks.tsx, apps/desktop/src/renderer/components/new-chat/remoteBrowseAdapters.ts, apps/desktop/src/renderer/components/new-chat/remoteExistingProjects.ts, apps/desktop/src/renderer/components/new-chat/sessionLinkPaste.ts, apps/desktop/src/renderer/components/new-chat/sourceSwitch.ts, apps/desktop/src/renderer/components/new-chat/unifiedModelSelection.ts, apps/desktop/src/renderer/components/new-chat/usagePalette.ts, apps/desktop/src/renderer/components/new-chat/useComposerSendFocusRestore.ts, apps/desktop/src/renderer/components/new-chat/useModelDiscoveryPending.ts, apps/desktop/src/renderer/components/new-chat/useProviderWeeklyQuota.ts, apps/desktop/src/renderer/components/new-chat/useUnifiedRowActions.ts, apps/desktop/src/renderer/features/cc-agent/CCAgentFeatureLayout.tsx, apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx | 273 | 46 | 407 |
| `desktop.dev.maker-experimental` | desktop | Maker 实验诊断页 | hash `/maker-experimental`(MakerExperimentalView;EXPERIMENTAL_FEATURES 现为空,仍是生产路由) | MakerExperimentalView | apps/desktop/src/renderer/features/maker-experimental/MakerExperimentalView.tsx | 10 | 0 | 11 |
| `desktop.issues.guide` | desktop | Issue 引导页 | hash `/issues`(IssueTrackerFeatureLayout,已迁 GitHub 后的引导页) | IssueTrackerFeatureLayout | apps/desktop/src/renderer/features/issue-tracker/IssueTrackerFeatureLayout.tsx, apps/desktop/src/renderer/features/issue-tracker/MyIssueList.tsx, apps/desktop/src/renderer/features/issue-tracker/hooks/useMyIssues.ts, apps/desktop/src/renderer/features/issue-tracker/lib/myIssuesNotices.ts, apps/desktop/src/renderer/features/issue-tracker/lib/startIssueChat.ts | 0 | 0 | 8 |
| `desktop.native.app-menu` | desktop | 应用菜单 | Menu.setApplicationMenu(用户可见出口,不展开业务逻辑) | applicationMenuLabels | apps/desktop/src/main/applicationMenuLabels.ts | 0 | 0 | 0 |
diff --git a/docs/dev-rules/environment-setup.md b/docs/dev-rules/environment-setup.md
index 4bf91507ec..7ffab9b765 100644
--- a/docs/dev-rules/environment-setup.md
+++ b/docs/dev-rules/environment-setup.md
@@ -33,6 +33,13 @@ pnpm install
新 worktree 不共享 `node_modules`。确认 checkout 已完成且根 `package.json` 存在后,
在该 worktree 内重新运行 `pnpm install`。
+Cindy Make 在准备受管源码时,先切到 `cindy-personal`,按锁文件安装包含开发依赖的完整
+依赖,成功后才标记仓库就绪。后续开发分支的 worktree 使用已选定的系统或 Cindy 管理
+工具(含原生依赖构建所需的 Python),并通过
+`pnpm install --frozen-lockfile --prefer-offline --prod=false` 优先复用
+准备阶段填充的 pnpm store 缓存;各 worktree 仍保留独立的 `node_modules`,不复制或
+链接个人分支的依赖目录。安装失败或取消可在现有 checkout 上重试,不重置个人分支。
+
## Linux:Electron SUID sandbox 权限
较新的 Ubuntu(23.10+ 默认用 AppArmor 限制非特权 user namespace)上,Electron 会退回