@xfey/tutti 0.1.68 → 0.1.69

package/dist/chat-assistant/index.d.ts

@@ -43,7 +43,7 @@ export type ReadOnlyChatAssistantOptions = {
     workspaceRoot: string;
     model: ReadOnlyChatAssistantModel;
     promptsRoot?: string;
-    onScratchpadSourceChanged?: () => void;
+    onScratchpadSourceChanged?: (message: MessageProjection) => void;
     now?: () => Date;
 };
 export declare function isChatAssistantOutput(value: unknown): value is ChatAssistantOutput;

package/dist/chat-assistant/index.js

@@ -206,7 +206,7 @@ export class ReadOnlyChatAssistant {
             invalidates: mainChatMessageInvalidates(),
         });
         if (refs?.scratchpad_source !== "exclude") {
-            this.options.onScratchpadSourceChanged?.();
+            this.options.onScratchpadSourceChanged?.(message);
         }
     }
     appendClarificationRoundAssistantMessage(input) {

package/dist/collaboration-state/task-compile-context.js

@@ -2,6 +2,16 @@ import { withHostStoreTransaction } from "../store/index.js";
 import { readScratchpadProjection } from "./scratchpad.js";
 import { readScratchpadSourceState } from "./scratchpad-source-state.js";
 import { nowIso, stringifyJson } from "./serialization.js";
+function cursorIsAfter(left, right) {
+    if (left === undefined) {
+        return false;
+    }
+    if (right === undefined) {
+        return true;
+    }
+    const timeOrder = left.created_at.localeCompare(right.created_at);
+    return timeOrder > 0 || (timeOrder === 0 && left.message_id > right.message_id);
+}
 function parseStringArray(value, field) {
     let parsed;
     try {
@@ -238,11 +248,18 @@ export function rollbackTaskCompileContext(db, input) {
         }
         const rolledBackAt = nowIso(input.now);
         const sourceState = readScratchpadSourceState(tx);
-        const dirtySince = sourceState.in_flight !== undefined &&
-            new Date(rolledBackAt).getTime() <= new Date(sourceState.in_flight.started_at).getTime()
-            ? new Date(new Date(sourceState.in_flight.started_at).getTime() + 1).toISOString()
-            : rolledBackAt;
         const after = context.source_window.after;
+        const through = context.source_window.through;
+        const hasBoundaryAfterSourceChanges = sourceState.dirty_since !== undefined ||
+            sourceState.in_flight !== undefined ||
+            cursorIsAfter(sourceState.refreshed_through_cursor, through);
+        const dirtySince = hasBoundaryAfterSourceChanges
+            ? sourceState.in_flight !== undefined &&
+                new Date(rolledBackAt).getTime() <= new Date(sourceState.in_flight.started_at).getTime()
+                ? new Date(new Date(sourceState.in_flight.started_at).getTime() + 1).toISOString()
+                : rolledBackAt
+            : null;
+        const restoredThrough = hasBoundaryAfterSourceChanges ? after : through;
         tx.prepare(`
         INSERT INTO scratchpad_source_state (
           id,
@@ -261,7 +278,7 @@ export function rollbackTaskCompileContext(db, input) {
           refreshed_through_cursor_message_id = excluded.refreshed_through_cursor_message_id,
           dirty_since = excluded.dirty_since,
           updated_at = excluded.updated_at
-      `).run(after?.created_at ?? null, after?.message_id ?? null, after?.created_at ?? null, after?.message_id ?? null, dirtySince, rolledBackAt);
+      `).run(after?.created_at ?? null, after?.message_id ?? null, restoredThrough?.created_at ?? null, restoredThrough?.message_id ?? null, dirtySince, rolledBackAt);
         tx.prepare("DELETE FROM active_task_compile_context WHERE workflow_ref = ?").run(input.workflow_ref);
         return true;
     });

package/dist/control-plane/index.d.ts

@@ -1,5 +1,5 @@
 import { type ActivityRef, type ClarificationRoundRef, type IdempotencyKey, type WorkflowInvocationRef } from "@tutti/shared/ids";
-import type { ExecutionStatusProjection, ContextSyncDisposition, ContextSyncResult, RefreshScratchpadDisposition, RefreshScratchpadResult, RunSchedulerNowDisposition, RunSchedulerNowPayload, RefreshReferenceSummariesDisposition, RefreshReferenceSummariesPayload, RefreshReferenceSummariesResult, SendClarificationRoundMessageDisposition, SendClarificationRoundMessagePayload, SendClarificationRoundMessageResult, SubmitClarificationRoundDisposition, SubmitClarificationRoundPayload, SubmitClarificationRoundResult, SubmitWorklistDisposition, SubmitWorklistPayload, SubmitWorklistResult, ProcedureLane } from "@tutti/shared/schemas/api";
+import type { ExecutionStatusProjection, MessageProjection, ContextSyncDisposition, ContextSyncResult, RefreshScratchpadDisposition, RefreshScratchpadResult, RunSchedulerNowDisposition, RunSchedulerNowPayload, RefreshReferenceSummariesDisposition, RefreshReferenceSummariesPayload, RefreshReferenceSummariesResult, SendClarificationRoundMessageDisposition, SendClarificationRoundMessagePayload, SendClarificationRoundMessageResult, SubmitClarificationRoundDisposition, SubmitClarificationRoundPayload, SubmitClarificationRoundResult, SubmitWorklistDisposition, SubmitWorklistPayload, SubmitWorklistResult, ProcedureLane } from "@tutti/shared/schemas/api";
 import type { ContextSyncWorkflowTrigger } from "./workflows/index.js";
 import type { ControlPlaneCommandResult, Phase5ControlPlaneOptions, StartupRecoveryOptions, StartupRecoveryResult, TrustedHumanAuthor } from "./types.js";
 import { type ProjectBriefRefreshReason, type RefreshProjectBriefProjectionResult } from "./project-brief-refresh.js";
@@ -30,7 +30,7 @@ export declare class Phase5ControlPlane {
     startScratchpadRefresh(options?: {
         lane?: ProcedureLane;
     }): ControlPlaneCommandResult<RefreshScratchpadDisposition, RefreshScratchpadResult>;
-    notifyScratchpadSourceChanged(): void;
+    notifyScratchpadSourceChanged(message: MessageProjection): void;
     refreshProjectBrief(options: {
         reason: ProjectBriefRefreshReason;
         workflowRef?: WorkflowInvocationRef;

package/dist/control-plane/index.js

@@ -9,6 +9,7 @@ import { runControlPlaneStartupRecovery } from "./startup-recovery.js";
 import { readControlPlaneExecutionStatus } from "./execution-status.js";
 import { ScratchpadAutoRefreshScheduler } from "./scratchpad-auto-refresh.js";
 import { startControlPlaneScratchpadRefresh } from "./scratchpad-refresh-start.js";
+import { shouldUseMessageAsScratchpadSource } from "./scratchpad-source-messages.js";
 import { startControlPlaneTaskCompile } from "./task-compile-start.js";
 import { startControlPlaneTaskCompileContinuation } from "./task-compile-continuation.js";
 import { startControlPlaneTaskBoundFollowUpCheck } from "./follow-up-start.js";
@@ -106,7 +107,10 @@ export class Phase5ControlPlane {
             publishProcedureTransition: (state) => this.publishProcedureTransition(state),
         });
     }
-    notifyScratchpadSourceChanged() {
+    notifyScratchpadSourceChanged(message) {
+        if (!shouldUseMessageAsScratchpadSource(message)) {
+            return;
+        }
         this.scratchpadAutoRefreshScheduler.notifySourceChanged();
     }
     refreshProjectBrief(options) {

package/dist/providers/openai/app-server/json-rpc.js

@@ -1,5 +1,6 @@
 import { StringDecoder } from "node:string_decoder";
 import { redactText } from "@tutti/shared/utils";
+const PROCESS_EXIT_STDERR_EXCERPT_MAX_LENGTH = 500;
 export class CodexAppServerProtocolError extends Error {
     code;
     constructor(message, code) {
@@ -21,6 +22,16 @@ function normalizeProtocolError(method, error) {
     const message = typeof rawMessage === "string" ? redactText(rawMessage) : "protocol_error";
     return new CodexAppServerProtocolError(`Codex app-server request failed: ${method}: ${code}: ${message}`, "request_failed");
 }
+function processExitStderrExcerpt(value) {
+    const normalized = redactText(value).replace(/\s+/gu, " ").trim();
+    if (normalized.length === 0) {
+        return "";
+    }
+    if (normalized.length <= PROCESS_EXIT_STDERR_EXCERPT_MAX_LENGTH) {
+        return normalized;
+    }
+    return `${normalized.slice(0, PROCESS_EXIT_STDERR_EXCERPT_MAX_LENGTH)}...`;
+}
 export class CodexAppServerJsonRpcClient {
     child;
     options;
@@ -47,7 +58,8 @@ export class CodexAppServerJsonRpcClient {
         });
         child.on("exit", (code, signal) => {
             this.closed = true;
-            this.rejectAll(new CodexAppServerProtocolError(`Codex app-server exited before request completed: code=${code ?? "null"} signal=${signal ?? "null"}`, "process_exited"));
+            const stderrExcerpt = processExitStderrExcerpt(this.stderrText);
+            this.rejectAll(new CodexAppServerProtocolError(`Codex app-server exited before request completed: code=${code ?? "null"} signal=${signal ?? "null"}${stderrExcerpt === "" ? "" : ` stderr=${stderrExcerpt}`}`, "process_exited"));
         });
         child.on("error", (error) => {
             this.closed = true;

package/dist/providers/openai/app-server/linux-sandbox-readiness.js

@@ -2,7 +2,7 @@ import { spawnSync } from "node:child_process";
 import { mkdirSync, mkdtempSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { CODEX_APP_SERVER_COMMAND } from "../codex-app-server.js";
+import { buildCodexCliProcessPlan } from "../codex-app-server.js";
 import { createCodexSpawnEnv } from "./runtime-helpers.js";
 const DEFAULT_PROBE_TIMEOUT_MS = 10_000;
 export const CODEX_LINUX_SANDBOX_GUIDANCE = "Install bubblewrap. On Ubuntu 24.04, also install apparmor-profiles and apparmor-utils and load the distribution bwrap-userns-restrict profile. Then run `tutti doctor` again.";
@@ -74,9 +74,12 @@ export function inspectCodexLinuxSandboxReadiness(options = {}) {
         const codexHome = join(tempRoot, "codex-home");
         mkdirSync(codexHome, { recursive: true, mode: 0o700 });
         const runProbe = options.runProbe ?? defaultProbeRunner;
-        return classifyProbeResult(runProbe({
-            command: options.codexCommand ?? CODEX_APP_SERVER_COMMAND,
+        const processPlan = buildCodexCliProcessPlan({
             args: ["sandbox", "--", "/bin/true"],
+            ...(options.codexCommand === undefined ? {} : { codexCommand: options.codexCommand }),
+        });
+        return classifyProbeResult(runProbe({
+            ...processPlan,
             cwd: tempRoot,
             env: createCodexSpawnEnv(codexHome, options.baseEnv ?? process.env),
             timeoutMs: options.timeoutMs ?? DEFAULT_PROBE_TIMEOUT_MS,

package/dist/providers/openai/app-server/read-only-procedure.js

@@ -120,9 +120,9 @@ export async function runCodexAppServerReadOnlyProcedure(options) {
     const processPlan = buildCodexAppServerProcessPlan({
         codexHome,
         configOverrides: buildCodexAppServerProviderConfigOverrides(options),
+        ...(options.codexCommand === undefined ? {} : { codexCommand: options.codexCommand }),
     });
-    const command = options.codexCommand ?? processPlan.command;
-    const child = spawn(command, processPlan.args, {
+    const child = spawn(processPlan.command, processPlan.args, {
         cwd: process.cwd(),
         env: createCodexSpawnEnv(codexHome, options.baseEnv ?? process.env),
         stdio: "pipe",

package/dist/providers/openai/app-server/smoke.js

@@ -25,9 +25,9 @@ export async function runCodexAppServerNoWriteSmoke(options) {
     const processPlan = buildCodexAppServerProcessPlan({
         codexHome,
         configOverrides: buildCodexAppServerProviderConfigOverrides(options),
+        ...(options.codexCommand === undefined ? {} : { codexCommand: options.codexCommand }),
     });
-    const command = options.codexCommand ?? processPlan.command;
-    const child = spawn(command, processPlan.args, {
+    const child = spawn(processPlan.command, processPlan.args, {
         cwd: process.cwd(),
         env: createCodexSpawnEnv(codexHome, options.baseEnv ?? process.env),
         stdio: "pipe",

package/dist/providers/openai/app-server/workspace-write-run.js

@@ -196,9 +196,9 @@ export async function runCodexAppServerWorkspaceWriteRun(options) {
     const processPlan = buildCodexAppServerProcessPlan({
         codexHome,
         configOverrides: buildCodexAppServerProviderConfigOverrides(options),
+        ...(options.codexCommand === undefined ? {} : { codexCommand: options.codexCommand }),
     });
-    const command = options.codexCommand ?? processPlan.command;
-    const child = spawn(command, processPlan.args, {
+    const child = spawn(processPlan.command, processPlan.args, {
         cwd: process.cwd(),
         env: createCodexSpawnEnv(codexHome, options.baseEnv ?? process.env),
         stdio: "pipe",

package/dist/providers/openai/codex-app-server.d.ts

@@ -1,3 +1,4 @@
+export declare const CODEX_APP_SERVER_ENTRYPOINT: string;
 export declare const CODEX_APP_SERVER_COMMAND: string;
 export declare const CODEX_APP_SERVER_LISTEN_URL: "stdio://";
 export declare const CODEX_APP_SERVER_CLIENT_NAME: "tutti_host";
@@ -73,8 +74,13 @@ export type CodexAppServerTurnStartTemplatePlan = {
 };
 export type BuildCodexAppServerProcessPlanOptions = {
     codexHome: string;
+    codexCommand?: string;
     configOverrides?: readonly CodexAppServerConfigOverride[];
 };
+export type CodexCliProcessPlan = {
+    command: string;
+    args: string[];
+};
 export type CodexAppServerNoWriteSmokePlan = {
     process: CodexAppServerProcessPlan;
     initialize: CodexAppServerRequestPlan<"initialize", CodexAppServerInitializeRequestParams>;
@@ -107,6 +113,10 @@ export declare const CODEX_NO_WRITE_SMOKE_OUTPUT_SCHEMA: {
 export declare function createCodexAppServerProcessEnv(options: {
     codexHome: string;
 }): Record<string, string>;
+export declare function buildCodexCliProcessPlan(options: {
+    args: readonly string[];
+    codexCommand?: string;
+}): CodexCliProcessPlan;
 export declare function buildCodexAppServerProcessPlan(options: BuildCodexAppServerProcessPlanOptions): CodexAppServerProcessPlan;
 export declare function createCodexAppServerNoWriteSmokePlan(options: CodexNoWriteSmokePlanOptions): CodexAppServerNoWriteSmokePlan;
 export declare class CodexAppServerJsonlParseError extends Error {

package/dist/providers/openai/codex-app-server.js

@@ -2,7 +2,8 @@ import { createRequire } from "node:module";
 import { dirname, isAbsolute, join } from "node:path";
 import { DEFAULT_OPENAI_MODEL } from "./model-config.js";
 const require = createRequire(import.meta.url);
-export const CODEX_APP_SERVER_COMMAND = join(dirname(require.resolve("@openai/codex/package.json")), "bin", "codex.js");
+export const CODEX_APP_SERVER_ENTRYPOINT = join(dirname(require.resolve("@openai/codex/package.json")), "bin", "codex.js");
+export const CODEX_APP_SERVER_COMMAND = process.execPath;
 export const CODEX_APP_SERVER_LISTEN_URL = "stdio://";
 export const CODEX_APP_SERVER_CLIENT_NAME = "tutti_host";
 export const CODEX_APP_SERVER_CLIENT_TITLE = "Tutti Host";
@@ -37,12 +38,28 @@ export function createCodexAppServerProcessEnv(options) {
         CODEX_HOME: options.codexHome,
     };
 }
-export function buildCodexAppServerProcessPlan(options) {
-    const args = ["app-server", "--listen", CODEX_APP_SERVER_LISTEN_URL];
-    pushConfigOverrides(args, options.configOverrides ?? []);
+export function buildCodexCliProcessPlan(options) {
+    if (options.codexCommand !== undefined) {
+        assertNonEmpty(options.codexCommand, "codexCommand");
+        return {
+            command: options.codexCommand,
+            args: [...options.args],
+        };
+    }
     return {
         command: CODEX_APP_SERVER_COMMAND,
-        args,
+        args: [CODEX_APP_SERVER_ENTRYPOINT, ...options.args],
+    };
+}
+export function buildCodexAppServerProcessPlan(options) {
+    const codexArgs = ["app-server", "--listen", CODEX_APP_SERVER_LISTEN_URL];
+    pushConfigOverrides(codexArgs, options.configOverrides ?? []);
+    const processPlan = buildCodexCliProcessPlan({
+        args: codexArgs,
+        ...(options.codexCommand === undefined ? {} : { codexCommand: options.codexCommand }),
+    });
+    return {
+        ...processPlan,
         env: createCodexAppServerProcessEnv({ codexHome: options.codexHome }),
         transport: {
             kind: "stdio",

package/dist/server-shell/cli/host-server-runtime.js

@@ -283,7 +283,7 @@ export async function startForegroundHostServer(options) {
                 return await resolution.model.answer(input);
             },
         },
-        onScratchpadSourceChanged: () => controlPlane.notifyScratchpadSourceChanged(),
+        onScratchpadSourceChanged: (message) => controlPlane.notifyScratchpadSourceChanged(message),
         now,
     });
     let close = async () => { };

package/dist/server-shell/http/routes/project-api/messages-routes.js

@@ -71,7 +71,7 @@ export function registerMessagesRoutes(app, { options, workspaceEvents, }) {
                 },
                 invalidates: mainChatMessageInvalidates(),
             });
-            options.controlPlane?.notifyScratchpadSourceChanged();
+            options.controlPlane?.notifyScratchpadSourceChanged(execution.result.message);
             options.chatAssistant?.enqueue({ message: execution.result.message });
         }
         return response;

package/dist/server-shell/http/routes/project-api/reference-files-routes.js

@@ -137,7 +137,7 @@ export function registerReferenceFilesRoutes(app, { options, workspaceEvents, })
                     },
                     invalidates,
                 });
-                options.controlPlane?.notifyScratchpadSourceChanged();
+                options.controlPlane?.notifyScratchpadSourceChanged(execution.result.message);
                 options.controlPlane?.startReferenceSummaryRefresh({
                     paths: [execution.result.file.path],
                 });

package/dist/server-shell/local-console/invocation-context.d.ts

@@ -19,10 +19,12 @@ export declare function createDesktopLocalConsoleInvocationContext(options: {
 export declare function createLocalConsoleServiceEnvironment(options: {
     env: NodeJS.ProcessEnv;
     tuttiHome: string;
+    runtimeExecutablePath?: string;
 }): NodeJS.ProcessEnv;
 export declare function createLocalConsoleOperationEnvironment(options: {
     serviceEnvironment: NodeJS.ProcessEnv;
     invocationEnvironment: LocalConsoleInvocationEnvironment;
     tuttiHome: string;
+    runtimeExecutablePath?: string;
 }): NodeJS.ProcessEnv;
 //# sourceMappingURL=invocation-context.d.ts.map

package/dist/server-shell/local-console/invocation-context.js

@@ -1,4 +1,4 @@
-import { resolve } from "node:path";
+import { delimiter, dirname, resolve } from "node:path";
 export const LOCAL_CONSOLE_INVOCATION_ENV_KEYS = [
     "DBUS_SESSION_BUS_ADDRESS",
     "DISPLAY",
@@ -12,6 +12,12 @@ export const LOCAL_CONSOLE_INVOCATION_ENV_KEYS = [
     "WAYLAND_DISPLAY",
     "XDG_CURRENT_DESKTOP",
 ];
+function mergeExecutablePaths(values, runtimeExecutablePath) {
+    const entries = [dirname(runtimeExecutablePath), ...values.flatMap((value) => value?.split(delimiter) ?? [])]
+        .map((entry) => entry.trim())
+        .filter((entry) => entry !== "");
+    return [...new Set(entries)].join(delimiter);
+}
 export function collectLocalConsoleInvocationEnvironment(env) {
     const environment = {};
     for (const key of LOCAL_CONSOLE_INVOCATION_ENV_KEYS) {
@@ -52,12 +58,15 @@ export function createLocalConsoleServiceEnvironment(options) {
             environment[key] = value;
         }
     }
+    environment.PATH = mergeExecutablePaths([environment.PATH], options.runtimeExecutablePath ?? process.execPath);
     return environment;
 }
 export function createLocalConsoleOperationEnvironment(options) {
+    const executablePath = mergeExecutablePaths([options.invocationEnvironment.PATH, options.serviceEnvironment.PATH], options.runtimeExecutablePath ?? process.execPath);
     return {
         ...options.serviceEnvironment,
         ...options.invocationEnvironment,
+        PATH: executablePath,
         TUTTI_HOME: options.tuttiHome,
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfey/tutti",
-  "version": "0.1.68",
+  "version": "0.1.69",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",