@cjhyy/code-shell-core 0.9.2 → 0.9.4

package/dist/profile/types.d.ts

@@ -125,6 +125,11 @@ export declare const WorkspaceProfileRequirementsSchema: z.ZodObject<{
         hint?: string | undefined;
     }>, "many">>;
 }, "strip", z.ZodTypeAny, {
+    tools: {
+        bin: string;
+        minVersion?: string | undefined;
+        hint?: string | undefined;
+    }[];
     skills: {
         source: "github";
         scope: "project";
@@ -132,12 +137,12 @@ export declare const WorkspaceProfileRequirementsSchema: z.ZodObject<{
         fullDepth: boolean;
         skills?: string[] | undefined;
     }[];
-    tools: {
+}, {
+    tools?: {
         bin: string;
         minVersion?: string | undefined;
         hint?: string | undefined;
-    }[];
-}, {
+    }[] | undefined;
     skills?: {
         source: "github";
         repo: string;
@@ -145,11 +150,6 @@ export declare const WorkspaceProfileRequirementsSchema: z.ZodObject<{
         skills?: string[] | undefined;
         fullDepth?: boolean | undefined;
     }[] | undefined;
-    tools?: {
-        bin: string;
-        minVersion?: string | undefined;
-        hint?: string | undefined;
-    }[] | undefined;
 }>;
 export type SkillRequirement = z.infer<typeof skillRequirementSchema>;
 export type ToolRequirement = z.infer<typeof toolRequirementSchema>;
@@ -206,6 +206,11 @@ export declare const WorkspaceProfileSchema: z.ZodObject<{
             hint?: string | undefined;
         }>, "many">>;
     }, "strip", z.ZodTypeAny, {
+        tools: {
+            bin: string;
+            minVersion?: string | undefined;
+            hint?: string | undefined;
+        }[];
         skills: {
             source: "github";
             scope: "project";
@@ -213,12 +218,12 @@ export declare const WorkspaceProfileSchema: z.ZodObject<{
             fullDepth: boolean;
             skills?: string[] | undefined;
         }[];
-        tools: {
+    }, {
+        tools?: {
             bin: string;
             minVersion?: string | undefined;
             hint?: string | undefined;
-        }[];
-    }, {
+        }[] | undefined;
         skills?: {
             source: "github";
             repo: string;
@@ -226,11 +231,6 @@ export declare const WorkspaceProfileSchema: z.ZodObject<{
             skills?: string[] | undefined;
             fullDepth?: boolean | undefined;
         }[] | undefined;
-        tools?: {
-            bin: string;
-            minVersion?: string | undefined;
-            hint?: string | undefined;
-        }[] | undefined;
     }>>;
     /**
      * true → 独占工作面：激活时把**未声明**的 skill/plugin/mcp/agent 显式关掉，
@@ -264,6 +264,11 @@ export declare const WorkspaceProfileSchema: z.ZodObject<{
     version?: string | undefined;
     description?: string | undefined;
     requires?: {
+        tools: {
+            bin: string;
+            minVersion?: string | undefined;
+            hint?: string | undefined;
+        }[];
         skills: {
             source: "github";
             scope: "project";
@@ -271,11 +276,6 @@ export declare const WorkspaceProfileSchema: z.ZodObject<{
             fullDepth: boolean;
             skills?: string[] | undefined;
         }[];
-        tools: {
-            bin: string;
-            minVersion?: string | undefined;
-            hint?: string | undefined;
-        }[];
     } | undefined;
     mainInstruction?: string | undefined;
 }, {
@@ -289,6 +289,11 @@ export declare const WorkspaceProfileSchema: z.ZodObject<{
     plugins?: string[] | undefined;
     agents?: string[] | undefined;
     requires?: {
+        tools?: {
+            bin: string;
+            minVersion?: string | undefined;
+            hint?: string | undefined;
+        }[] | undefined;
         skills?: {
             source: "github";
             repo: string;
@@ -296,11 +301,6 @@ export declare const WorkspaceProfileSchema: z.ZodObject<{
             skills?: string[] | undefined;
             fullDepth?: boolean | undefined;
         }[] | undefined;
-        tools?: {
-            bin: string;
-            minVersion?: string | undefined;
-            hint?: string | undefined;
-        }[] | undefined;
     } | undefined;
     exclusiveCapabilities?: boolean | undefined;
     mainInstruction?: string | undefined;

package/dist/protocol/background-result-wakeup.d.ts

@@ -1,4 +1,5 @@
 import type { StreamEvent } from "../types.js";
+import { type NotificationQueue } from "../tool-system/builtin/agent-notifications.js";
 import type { ApprovalRouter } from "../tool-system/permission.js";
 import type { ChatSession } from "./chat-session.js";
 import type { ChatSessionManager } from "./chat-session-manager.js";
@@ -8,11 +9,12 @@ interface BackgroundResultWakeOptions {
     rehydrate(sessionId: string): Promise<ChatSession | null>;
     approvalRouter: ApprovalRouter;
     onStream(event: StreamEvent): void;
+    notificationMailbox?: NotificationQueue;
 }
 /**
  * Drain pending background results into exactly one synthetic continuation.
  * Busy sessions are awaited so a completion cannot fall into the gap between
  * the notification bus callback and the interactive run-boundary re-check.
  */
-export declare function wakeSessionForBackgroundResults({ sessionId, manager, rehydrate, approvalRouter, onStream, }: BackgroundResultWakeOptions): Promise<boolean>;
+export declare function wakeSessionForBackgroundResults({ sessionId, manager, rehydrate, approvalRouter, onStream, notificationMailbox, }: BackgroundResultWakeOptions): Promise<boolean>;
 export {};

package/dist/protocol/background-result-wakeup.js

@@ -5,7 +5,7 @@ import { buildNotificationMessage, notificationQueue, } from "../tool-system/bui
  * Busy sessions are awaited so a completion cannot fall into the gap between
  * the notification bus callback and the interactive run-boundary re-check.
  */
-export async function wakeSessionForBackgroundResults({ sessionId, manager, rehydrate, approvalRouter, onStream, }) {
+export async function wakeSessionForBackgroundResults({ sessionId, manager, rehydrate, approvalRouter, onStream, notificationMailbox = notificationQueue, }) {
     if (!manager) {
         logger.debug("bg_wakeup.skipped", { sessionId, reason: "no_chat_manager" });
         return false;
@@ -22,7 +22,7 @@ export async function wakeSessionForBackgroundResults({ sessionId, manager, rehy
     while (session.isBusy()) {
         logger.debug("bg_wakeup.waiting_for_idle", {
             sessionId,
-            pendingCount: notificationQueue.getSnapshot(sessionId).length,
+            pendingCount: notificationMailbox.getSnapshot(sessionId).length,
         });
         await session.settled;
         if (manager.isUnavailable(sessionId)) {
@@ -63,7 +63,7 @@ export async function wakeSessionForBackgroundResults({ sessionId, manager, rehy
         });
         return false;
     }
-    const pending = notificationQueue.drainAll(sessionId);
+    const pending = notificationMailbox.drainAll(sessionId);
     if (pending.length === 0) {
         logger.debug("bg_wakeup.skipped", { sessionId, reason: "no_pending_results" });
         return false;
@@ -77,7 +77,7 @@ export async function wakeSessionForBackgroundResults({ sessionId, manager, rehy
             approvalRouter,
         });
         if (result.turnCount === 0) {
-            const restored = notificationQueue.restoreResults(sessionId, pending);
+            const restored = notificationMailbox.restoreResults(sessionId, pending);
             logger.warn("bg_wakeup.turn_not_started", {
                 sessionId,
                 restored,
@@ -89,7 +89,7 @@ export async function wakeSessionForBackgroundResults({ sessionId, manager, rehy
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        const restored = notificationQueue.restoreResults(sessionId, pending);
+        const restored = notificationMailbox.restoreResults(sessionId, pending);
         logger.warn("bg_wakeup.turn_failed", { sessionId, error: message, restored });
         // A setup failure can occur before the turn loop emits its own terminal
         // event. Emit an error so every renderer clears its busy state, but keep

package/dist/protocol/server.d.ts

@@ -17,6 +17,7 @@ import type { Transport } from "./transport.js";
 import type { Engine } from "../engine/engine.js";
 import type { ValidatedSettings } from "../settings/schema.js";
 import { type ApprovalRouter } from "../tool-system/permission.js";
+import { type NotificationQueue, type NotificationQueuePersistence } from "../tool-system/builtin/agent-notifications.js";
 import type { ChatSessionManager } from "./chat-session-manager.js";
 import type { ResolvedComposition } from "../composition/types.js";
 /**
@@ -106,6 +107,16 @@ export interface AgentServerOptions {
      * write.
      */
     sessionDiskRoot?: string;
+    /** Durable per-session result mailbox. Omitted keeps the in-memory behavior. */
+    notificationPersistence?: NotificationQueuePersistence;
+    /** Test/host seam; production uses the process singleton. */
+    notificationMailbox?: NotificationQueue;
+    /**
+     * Whether this server instance owns durable result restoration and idle
+     * wakeups. Defaults to true. Multi-connection hosts set one process-lifetime
+     * owner and leave connection servers as observation-only forwarders.
+     */
+    ownsBackgroundWakeups?: boolean;
     /** Shared owner router; injectable for hosts/tests, process singleton by default. */
     approvalRouter?: ApprovalRouter;
     /**
@@ -197,8 +208,10 @@ export declare class AgentServer {
      * itself outlives the server (it's a process-local singleton).
      */
     private bgAgentBusUnsubscribe;
+    private readonly ownsBackgroundWakeups;
     private readonly wakeupsInFlight;
     private readonly sessionWorkspaceRpc;
+    private readonly notificationMailbox;
     /**
      * Effective session manager for the connection this server serves. Without
      * a resolveIdentity hook this is exactly the host-supplied manager —

package/dist/protocol/server.js

@@ -381,8 +381,10 @@ export class AgentServer {
      * itself outlives the server (it's a process-local singleton).
      */
     bgAgentBusUnsubscribe = null;
+    ownsBackgroundWakeups;
     wakeupsInFlight = new Set();
     sessionWorkspaceRpc;
+    notificationMailbox;
     /**
      * Effective session manager for the connection this server serves. Without
      * a resolveIdentity hook this is exactly the host-supplied manager —
@@ -407,6 +409,11 @@ export class AgentServer {
         return manager;
     }
     constructor(options) {
+        this.notificationMailbox = options.notificationMailbox ?? notificationQueue;
+        this.ownsBackgroundWakeups = options.ownsBackgroundWakeups !== false;
+        if (options.notificationPersistence) {
+            this.notificationMailbox.attachPersistence(options.notificationPersistence);
+        }
         this.baseChatManager = options.chatManager ?? null;
         this.resolveIdentity = options.resolveIdentity ?? null;
         this.sessionDiskRoot = options.sessionDiskRoot;
@@ -509,8 +516,9 @@ export class AgentServer {
                 // legacy UI event is only an observation path. A renderer transport
                 // failure after accepting the event must not strand the result in the
                 // queue, so schedule the wake from finally.
-                if (envelope.kind === "result")
+                if (this.ownsBackgroundWakeups && envelope.kind === "result") {
                     this.maybeWakeIdleSession(sessionId);
+                }
             }
             // Background work that finishes while the session is idle (a
             // run_in_background Bash like a download, a background sub-agent, or a
@@ -523,6 +531,14 @@ export class AgentServer {
             // continuation. A never-exiting dev server emits no completion, so it
             // never wakes anything (no task/service classification needed).
         });
+        // Results restored from disk are deliberately not republished on the
+        // observation bus: their required destination is the original chat. Feed
+        // them into the same guarded wake path as live completions instead.
+        if (this.ownsBackgroundWakeups) {
+            for (const sessionId of this.notificationMailbox.restorePersistedSessions()) {
+                this.maybeWakeIdleSession(sessionId);
+            }
+        }
         // Notify client we're ready
         this.notify(Methods.Status, { status: "ready" });
     }
@@ -549,13 +565,15 @@ export class AgentServer {
      * wakeup turns while getOrCreate waits for a closing generation to settle.
      */
     maybeWakeIdleSession(sessionId) {
+        if (!this.ownsBackgroundWakeups)
+            return;
         if (this.wakeupsInFlight.has(sessionId))
             return;
         this.wakeupsInFlight.add(sessionId);
         void this.wakeIdleSession(sessionId)
             .then((ranTurn) => {
             this.wakeupsInFlight.delete(sessionId);
-            if (ranTurn && notificationQueue.getSnapshot(sessionId).length > 0) {
+            if (ranTurn && this.notificationMailbox.getSnapshot(sessionId).length > 0) {
                 this.maybeWakeIdleSession(sessionId);
             }
         })
@@ -574,6 +592,7 @@ export class AgentServer {
             rehydrate: (id) => this.rehydrateSessionForWake(id),
             approvalRouter: this.approvalRouter,
             onStream: (event) => this.notify(Methods.StreamEvent, { sessionId, event }),
+            notificationMailbox: this.notificationMailbox,
         });
     }
     async rehydrateSessionForWake(sessionId) {
@@ -582,7 +601,7 @@ export class AgentServer {
         if (this.chatManager.isUnavailable(sessionId))
             return null;
         try {
-            const pending = notificationQueue.getSnapshot(sessionId);
+            const pending = this.notificationMailbox.getSnapshot(sessionId);
             if (pending.length === 0) {
                 logger.debug("bg_wakeup.rehydrate_skipped_no_pending", { sessionId });
                 return null;

package/dist/services/index.d.ts

@@ -3,7 +3,6 @@
  */
 export { analytics, trackEvent } from "./analytics.js";
 export { authorize, refreshToken, generatePKCE, createHardenedOAuthFetch, type OAuthConfig, type OAuthTokens, type OAuthAuthorizeOptions, type OAuthRefreshOptions, type HardenedOAuthFetchOptions, } from "./oauth.js";
-export { notify, notifyComplete, notifyError } from "./notifier.js";
 export { diagnostics } from "./diagnostics.js";
 export { buildExtractionPrompt, parseExtractionResponse, type ExtractedMemory, } from "./extract-memories.js";
 export { shouldAutoDream, recordSession, recordDreamComplete, buildDreamSystemPrompt, buildDreamUserPrompt, } from "./auto-dream.js";

package/dist/services/index.js

@@ -9,7 +9,6 @@ export { analytics, trackEvent } from "./analytics.js";
 // to the tool_result-based microcompact in ContextManager). Removed to end
 // the "which microcompact?" ambiguity — the source of truth is ContextManager.
 export { authorize, refreshToken, generatePKCE, createHardenedOAuthFetch, } from "./oauth.js";
-export { notify, notifyComplete, notifyError } from "./notifier.js";
 export { diagnostics } from "./diagnostics.js";
 export { buildExtractionPrompt, parseExtractionResponse, } from "./extract-memories.js";
 export { shouldAutoDream, recordSession, recordDreamComplete, buildDreamSystemPrompt, buildDreamUserPrompt, } from "./auto-dream.js";

package/dist/session/memory.js

@@ -23,7 +23,7 @@
  * Deletes are SOFT — files are moved to <baseDir>/memory-trash/<ISO>/<scope>/
  * rather than removed, so accidental deletions are recoverable.
  */
-import { mkdirSync, existsSync, readFileSync, writeFileSync, readdirSync, renameSync, statSync, } from "node:fs";
+import { mkdirSync, existsSync, readFileSync, readdirSync, renameSync, statSync } from "node:fs";
 import { join } from "node:path";
 import { homedir } from "node:os";
 import { createHash, randomUUID } from "node:crypto";
@@ -174,7 +174,7 @@ export class MemoryManager {
             frontmatterLine("updateCount", updateCount) +
             `---\n\n` +
             `${entry.content}\n`;
-        writeFileSync(filePath, content, "utf-8");
+        writeFileAtomic(filePath, content, 0o600);
         // Incremental index update. Initialize the cache on first
         // save by paying one loadAll() — every save after that just
         // mutates the cache and rewrites MEMORY.md.

package/dist/session/session-manager.js

@@ -237,13 +237,42 @@ function normalizedSessionKind(kind) {
 export function codeShellHome() {
     return process.env.CODE_SHELL_HOME || join(homedir(), ".code-shell");
 }
+/** True when this process is a test runner. `bun test` sets NODE_ENV itself. */
+function isTestRunner() {
+    return process.env.NODE_ENV === "test" || process.env.BUN_TEST === "1";
+}
+/** The real per-user home, ignoring any CODE_SHELL_HOME override. */
+function defaultHome() {
+    return join(homedir(), ".code-shell");
+}
 /**
  * Canonical root for every persisted CodeShell session. An explicit `home`
  * (a `~/.code-shell`-equivalent data root) overrides the default resolution;
  * absent → `codeShellHome()` exactly as before.
  */
 export function sessionsRoot(home) {
-    return join(home ?? codeShellHome(), "sessions");
+    const resolvedHome = home ?? codeShellHome();
+    // Fail closed rather than write fixture sessions into the developer's real
+    // store. The bunfig preload only applies when Bun resolves a bunfig.toml:
+    // `bun test <file>` from a subdirectory, or an IDE/CI runner with its own
+    // cwd, finds none and silently fell through to ~/.code-shell — which is how
+    // ~700 `test-model` sessions ended up in the real store and the sidebar.
+    //
+    // Guarded here rather than in codeShellHome() because the home is also the
+    // legitimate root for settings/projects/trust that many tests read by
+    // design; only the SESSIONS root is the one tests corrupt.
+    if (isTestRunner() && resolvedHome === defaultHome()) {
+        // Prefer the preload's sandbox. Many test files delete CODE_SHELL_HOME in
+        // cleanup, and bun shares one process across files, so isolation would
+        // otherwise vanish for every later suite.
+        const sandbox = process.env.CODE_SHELL_TEST_HOME;
+        if (sandbox)
+            return join(sandbox, "sessions");
+        throw new SessionError("Refusing to use the real ~/.code-shell/sessions from a test. Set CODE_SHELL_HOME " +
+            "to a temp dir (packages/core/test-setup.ts does this via the bunfig preload) " +
+            "or pass an explicit storageDir.");
+    }
+    return join(resolvedHome, "sessions");
 }
 function isSessionWorkspace(value) {
     if (!value || typeof value !== "object")

package/dist/tool-system/builtin/agent-notifications.d.ts

@@ -119,12 +119,23 @@ export type NotificationItem = {
     enqueuedAt: number;
 };
 type Listener = () => void;
-declare class NotificationQueue {
+export interface NotificationQueuePersistence {
+    fileForSession(sessionId: string): string | null;
+    /** Optional startup inventory. Lazy per-session restore works without it. */
+    listSessionIds?(): readonly string[];
+}
+export declare class NotificationQueue {
     private buckets;
     private listeners;
     private sequences;
     private sequenceRoutes;
+    private persistence;
+    private restoredSessions;
     private readonly maxSequenceRoutes;
+    attachPersistence(persistence: NotificationQueuePersistence | null): void;
+    /** Restore every persisted mailbox discovered by the host during startup. */
+    restorePersistedSessions(): string[];
+    restorePersistedSession(sessionId: string): number;
     enqueue(draft: NotificationEnvelopeDraft): NotificationEnvelope | undefined;
     enqueue(item: NotificationItem, sessionId: string): ResultEnvelope | undefined;
     subscribe: (listener: Listener) => (() => void);
@@ -143,6 +154,19 @@ declare class NotificationQueue {
     clearProgress(sessionId: string, agentId: string, runtimeGeneration?: number): boolean;
     clearDirections(sessionId: string, runtimeGeneration: number): boolean;
     reset(sessionId?: string): void;
+    private resultSnapshot;
+    private persistAddedResults;
+    private persistRemovedResults;
+    private replacePersistedResults;
+    /**
+     * Cross-process mailbox mutation. The directory lock exists before the JSON
+     * file does, and the current contents are re-read inside that lock. This
+     * avoids both the old lock-outside seed race and stale-snapshot overwrite.
+     */
+    private mutatePersistedResults;
+    private parsePersistedResultsForMutation;
+    private quarantineCorruptFile;
+    private reseedSequence;
     private notify;
 }
 type EnvelopeBusHandler = (envelope: NotificationEnvelope) => void;