@zq-silk/yui 0.13.7 → 0.13.9

package/dist/runtime/structuredProviderHost.js

@@ -3,6 +3,7 @@ import { randomUUID } from "node:crypto";
 import { Duplex } from "node:stream";
 import WebSocket from "ws";
 import { CodexAppServerRequestError, CodexAppServerRuntime, codexAppServerErrorIsMissing } from "./codexAppServerRuntime.js";
+import { serializeAgentErrorRaw } from "./agentError.js";
 import { PROVIDER_ACCEPT_TIMEOUT_MS } from "./runtimeDeadlines.js";
 import { YUI_VERSION } from "../version.js";
 const PROVIDER_MESSAGE_MAX_BYTES = 16 * 1024 * 1024;
@@ -399,7 +400,7 @@ class CodexStructuredProviderSession {
         }
         const session = new CodexStructuredProviderSession(child, exit, processInstanceId, conversationId, runtime, onTerminal);
         session.#activeTurnId = resumedActiveTurnId;
-        const ownedTurn = control.kind === "ensure" ? control.ownedTurn : undefined;
+        const ownedTurn = control.kind === "restore" ? control.ownedTurn : undefined;
         session.#clientOwnedTurnId = ownedTurn?.turnId;
         stopOpeningBuffer();
         let recoveredTerminal;
@@ -426,7 +427,12 @@ class CodexStructuredProviderSession {
                         ? "failed"
                         : recovered.status === "interrupted" ? "cancelled" : "completed",
                     observedAt: new Date().toISOString(),
-                    ...(recovered.error === undefined ? {} : { error: recovered.error })
+                    ...(recovered.status !== "failed"
+                        ? {}
+                        : {
+                            error: recovered.error ?? "Provider Turn failed.",
+                            rawError: serializeAgentErrorRaw(recovered)
+                        })
                 };
                 session.#clientOwnedTurnId = undefined;
             }
@@ -459,13 +465,16 @@ class CodexStructuredProviderSession {
         const status = turn.status === "failed"
             ? "failed"
             : turn.status === "interrupted" ? "cancelled" : "completed";
+        const failure = status === "failed"
+            ? providerErrorEvidence(turn.error)
+            : undefined;
         const terminal = {
             conversationId: this.conversationId,
             nativeSessionId: this.conversationId,
             nativeTurnId,
             status,
             observedAt: new Date().toISOString(),
-            ...(status !== "failed" ? {} : { error: providerErrorText(turn.error) })
+            ...(failure === undefined ? {} : failure)
         };
         if (this.#submissionPending && emit) {
             this.#bufferedTerminals.push(terminal);
@@ -546,7 +555,6 @@ class ClaudeStructuredProviderSession {
     channel;
     adapterId = "claude";
     #activeTurnId;
-    #waiter;
     constructor(child, exit, processInstanceId, conversationId, channel) {
         this.child = child;
         this.exit = exit;
@@ -562,14 +570,6 @@ class ClaudeStructuredProviderSession {
         }
         const session = new ClaudeStructuredProviderSession(child, exit, processInstanceId, nativeSessionId, channel);
         channel.onMessage((message) => session.#receive(message, onTerminal));
-        exit.then(() => {
-            const waiter = session.#waiter;
-            if (waiter === undefined)
-                return;
-            clearTimeout(waiter.timer);
-            session.#waiter = undefined;
-            waiter.reject(new ProviderDeliveryUnknownError("Claude process exited before replaying the submitted user message.", waiter.attemptId));
-        }).catch(() => { });
         return session;
     }
     get nativeSessionId() {
@@ -579,24 +579,9 @@ class ClaudeStructuredProviderSession {
         return this.#activeTurnId;
     }
     async submitTurn(turn) {
-        if (this.#activeTurnId !== undefined || this.#waiter !== undefined) {
+        if (this.#activeTurnId !== undefined) {
             throw new ProviderTurnRejectedError("Provider Conversation already has an unsettled Turn.", turn.attemptId);
         }
-        let deliveryTimer;
-        const receipt = new Promise((resolvePromise, reject) => {
-            deliveryTimer = setTimeout(() => {
-                if (this.#waiter?.attemptId === turn.attemptId)
-                    this.#waiter = undefined;
-                reject(new ProviderDeliveryUnknownError("Claude did not replay the submitted user message before the acknowledgement deadline.", turn.attemptId));
-            }, PROVIDER_ACCEPT_TIMEOUT_MS);
-            this.#waiter = {
-                attemptId: turn.attemptId,
-                text: turn.boundedText,
-                resolve: resolvePromise,
-                reject,
-                timer: deliveryTimer
-            };
-        });
         try {
             await this.channel.send({
                 type: "user",
@@ -607,12 +592,22 @@ class ClaudeStructuredProviderSession {
             });
         }
         catch (error) {
-            if (deliveryTimer !== undefined)
-                clearTimeout(deliveryTimer);
-            this.#waiter = undefined;
-            throw new ProviderDeliveryUnknownError(`Claude input write did not produce an exact replay acknowledgement: ${error instanceof Error ? error.message : String(error)}`, turn.attemptId);
+            throw new ProviderDeliveryUnknownError(`Claude input write did not complete: ${error instanceof Error ? error.message : String(error)}`, turn.attemptId);
         }
-        return await receipt;
+        // AgentHost is the sole writer to this dedicated stream-json process.
+        // A completed pipe write is the smallest reliable acceptance boundary;
+        // Claude's later `result` is the matching terminal for this serialized
+        // Turn. Requiring an echoed user-message creates a second, brittle
+        // protocol without improving delivery safety.
+        const nativeTurnId = `claude-stream:${turn.attemptId}`;
+        this.#activeTurnId = nativeTurnId;
+        return Object.freeze({
+            attemptId: turn.attemptId,
+            conversationId: this.conversationId,
+            nativeSessionId: this.conversationId,
+            nativeTurnId,
+            acceptedAt: new Date().toISOString()
+        });
     }
     waitForExit() {
         return this.exit;
@@ -621,42 +616,17 @@ class ClaudeStructuredProviderSession {
         terminateProcessGroup(this.child, signal);
     }
     #receive(message, onTerminal) {
-        if (message.type === "user") {
-            const waiter = this.#waiter;
-            if (waiter === undefined || claudeUserText(message) !== waiter.text)
-                return;
-            const observedSessionId = optionalId(message.session_id);
-            if (observedSessionId !== this.conversationId) {
-                clearTimeout(waiter.timer);
-                this.#waiter = undefined;
-                waiter.reject(new ProviderDeliveryUnknownError("Claude replayed input for a different native Session.", waiter.attemptId));
-                return;
-            }
-            const nativeTurnId = optionalId(message.uuid);
-            if (nativeTurnId === undefined) {
-                clearTimeout(waiter.timer);
-                this.#waiter = undefined;
-                waiter.reject(new ProviderDeliveryUnknownError("Claude replayed input without a native message identity.", waiter.attemptId));
-                return;
-            }
-            this.#activeTurnId = nativeTurnId;
-            clearTimeout(waiter.timer);
-            this.#waiter = undefined;
-            waiter.resolve(Object.freeze({
-                attemptId: waiter.attemptId,
-                conversationId: this.conversationId,
-                nativeSessionId: this.conversationId,
-                nativeTurnId,
-                acceptedAt: new Date().toISOString()
-            }));
+        if (message.type === "user")
             return;
-        }
         if (message.type !== "result" || this.#activeTurnId === undefined
             || optionalId(message.session_id) !== this.conversationId)
             return;
         const nativeTurnId = this.#activeTurnId;
         this.#activeTurnId = undefined;
         const failed = message.is_error === true || message.subtype === "error_during_execution";
+        const result = typeof message.result === "string" && message.result.length > 0
+            ? message.result
+            : "Provider Turn failed.";
         onTerminal?.({
             conversationId: this.conversationId,
             nativeSessionId: this.conversationId,
@@ -664,9 +634,11 @@ class ClaudeStructuredProviderSession {
             clientOwned: true,
             status: failed ? "failed" : "completed",
             observedAt: new Date().toISOString(),
-            ...(typeof message.result === "string" && message.result.length > 0
-                ? failed ? { error: message.result } : { summary: message.result }
-                : {})
+            ...(failed
+                ? { error: result, rawError: providerErrorEvidence(message).rawError }
+                : typeof message.result === "string" && message.result.length > 0
+                    ? { summary: message.result }
+                    : {})
         });
     }
 }
@@ -712,19 +684,12 @@ function optionalId(value) {
 function nestedId(value, key) {
     return optionalId(object(value[key])?.id);
 }
-function providerErrorText(value) {
+function providerErrorEvidence(value) {
     const error = object(value);
-    if (typeof error?.message === "string" && error.message.length > 0)
-        return error.message;
-    return "Provider Turn failed.";
-}
-function claudeUserText(message) {
-    const content = object(message.message)?.content;
-    if (!Array.isArray(content))
-        return undefined;
-    const text = content.flatMap((entry) => {
-        const block = object(entry);
-        return block?.type === "text" && typeof block.text === "string" ? [block.text] : [];
-    });
-    return text.length === 1 ? text[0] : text.join("");
+    const message = typeof error?.message === "string" && error.message.length > 0
+        ? error.message
+        : typeof value === "string" && value.length > 0
+            ? value
+            : "Provider Turn failed.";
+    return { error: message, rawError: serializeAgentErrorRaw(value) };
 }

package/dist/runtime/taskRuntimeIsolation.js

@@ -212,9 +212,6 @@ export function createTaskRuntimeIsolationDescriptor(input) {
     const workspace = validateManagedWorkspace(input.workspace);
     const owner = taskRuntimeWorkspaceOwner(workspace.owner);
     const taskId = requireIdentity(owner.taskId, "Task id");
-    const runId = input.runId === undefined
-        ? undefined
-        : requireIdentity(input.runId, "Run id");
     const launchId = requireIdentity(input.launchId, "Launch id");
     const generationId = requireIdentity(input.generationId, "Generation id");
     const runtimeRoot = canonicalPath(input.runtimeRoot, "Task runtime root");
@@ -240,7 +237,6 @@ export function createTaskRuntimeIsolationDescriptor(input) {
         portAllocations,
         externalCapabilities: Object.freeze({ declared, requested }),
         generation: Object.freeze({
-            ...(runId === undefined ? {} : { runId }),
             launchId,
             generationId
         })
@@ -287,9 +283,6 @@ export function parseTaskRuntimeIsolationDescriptor(serialized) {
             requested: capabilities(external.requested, "Requested external capability")
         },
         generation: {
-            ...(generation.runId === undefined
-                ? {}
-                : { runId: requireIdentity(generation.runId, "Run id") }),
             launchId: requireIdentity(generation.launchId, "Launch id"),
             generationId: requireIdentity(generation.generationId, "Generation id")
         }

package/dist/runtime/tmuxAdapters.js

@@ -37,7 +37,7 @@ export class TmuxSessionHost {
     async start(request, beforeHostStart) {
         return this.#launch(request, beforeHostStart);
     }
-    async resume(request, beforeHostStart) {
+    async restore(request, beforeHostStart) {
         return this.#launch(request, beforeHostStart);
     }
     async stop(binding) {
@@ -228,10 +228,7 @@ export class TmuxSessionHost {
             ...(planned.launch.env.YUI_SESSION_TITLE === undefined
                 ? {}
                 : { sessionTitle: planned.launch.env.YUI_SESSION_TITLE }),
-            ...(nativeSessionId === undefined ? {} : { nativeSessionId }),
-            ...(planned.initialTurnRunId === undefined
-                ? {}
-                : { initialTurnRunId: planned.initialTurnRunId })
+            ...(nativeSessionId === undefined ? {} : { nativeSessionId })
         });
         const yuiHome = planned.launch.env.YUI_HOME;
         const childLifecycle = planned.launch.childLifecycle;
@@ -264,9 +261,6 @@ export class TmuxSessionHost {
                     roleName: request.owner.roleName
                 }),
                 hostCreated,
-                ...(hostCreated && planned.initialTurnRunId !== undefined
-                    ? { initialTurnRunId: planned.initialTurnRunId }
-                    : {}),
                 ...(nativeSessionId === undefined ? {} : { nativeSessionId })
             });
             if (hostCreated) {
@@ -277,7 +271,6 @@ export class TmuxSessionHost {
                 if (request.mode === "new"
                     && request.owner.scope === "task"
                     && request.runId !== undefined
-                    && planned.initialTurnRunId === request.runId
                     && this.#waitForNativeSession !== undefined) {
                     binding = createRuntimeBinding({
                         ...binding,
@@ -348,10 +341,6 @@ export class TmuxSessionHost {
             }
         };
         let hostCreated = false;
-        let providerAcknowledged = false;
-        let providerDeliveryUnknown = false;
-        let providerBusy = false;
-        let providerRejected = false;
         let providerDispatchObserved = false;
         let providerSnapshot;
         try {
@@ -363,17 +352,8 @@ export class TmuxSessionHost {
                     ...(request.owner.scope === "task" ? { taskId: request.owner.taskId } : {}),
                     roleName: request.owner.roleName,
                     launchId: reservation.launchId,
-                    requireTurnAck: planned.initialTurnRunId !== undefined
+                    requireTurnAck: false
                 });
-                providerDeliveryUnknown = providerSnapshot.state === "delivery-unknown";
-                providerBusy = planned.initialTurnRunId !== undefined
-                    && providerSnapshot.state === "busy";
-                providerRejected = planned.initialTurnRunId !== undefined
-                    && providerSnapshot.state === "rejected";
-                providerAcknowledged = !providerDeliveryUnknown && !providerBusy && !providerRejected;
-                if (providerSnapshot.state === "rejected" && !providerRejected) {
-                    throw new Error("Agent Host rejected a launch without an initial Provider Turn.");
-                }
                 providerDispatchObserved = true;
             }
             if (!hostCreated) {
@@ -396,25 +376,13 @@ export class TmuxSessionHost {
                 if (controlResult.outcome === "active-same-launch") {
                     broker.revoke(request.launchId);
                 }
-                const acceptableState = controlResult.snapshot.state === "ready"
-                    || (planned.initialTurnRunId === undefined
-                        && controlResult.snapshot.state === "idle");
-                const deliveryUnknownState = planned.initialTurnRunId !== undefined
-                    && controlResult.snapshot.state === "delivery-unknown";
-                const busyState = planned.initialTurnRunId !== undefined
-                    && controlResult.snapshot.state === "busy";
-                const rejectedState = planned.initialTurnRunId !== undefined
-                    && controlResult.snapshot.state === "rejected";
-                if ((!acceptableState && !deliveryUnknownState && !busyState && !rejectedState)
+                const acceptableState = ["idle", "ready", "busy"].includes(controlResult.snapshot.state);
+                if (!acceptableState
                     || controlResult.snapshot.launchId !== reservation.launchId) {
                     broker.revoke(request.launchId);
                     throw new Error(`Agent Host did not return an exact Provider acknowledgement for ${reservation.launchId}.`);
                 }
                 providerSnapshot = controlResult.snapshot;
-                providerAcknowledged = acceptableState;
-                providerDeliveryUnknown = deliveryUnknownState;
-                providerBusy = busyState;
-                providerRejected = rejectedState;
                 providerDispatchObserved = true;
             }
         }
@@ -457,18 +425,6 @@ export class TmuxSessionHost {
                 roleName: request.owner.roleName
             }),
             hostCreated,
-            ...(providerAcknowledged && planned.initialTurnRunId !== undefined
-                ? { initialTurnRunId: planned.initialTurnRunId }
-                : {}),
-            ...(providerDeliveryUnknown && planned.initialTurnRunId !== undefined
-                ? { initialTurnDeliveryUnknownRunId: planned.initialTurnRunId }
-                : {}),
-            ...(providerBusy && planned.initialTurnRunId !== undefined
-                ? { initialTurnBusyRunId: planned.initialTurnRunId }
-                : {}),
-            ...(providerRejected && planned.initialTurnRunId !== undefined
-                ? { initialTurnRejectedRunId: planned.initialTurnRunId }
-                : {}),
             ...((providerSnapshot?.nativeSessionId ?? nativeSessionId) === undefined
                 ? {}
                 : { nativeSessionId: providerSnapshot?.nativeSessionId ?? nativeSessionId }),
@@ -575,6 +531,7 @@ export class AgentHostPromptPushAdapter {
                     type: "submit-turn",
                     launchId: request.binding.launchId,
                     nativeSessionId: request.binding.nativeSessionId,
+                    runId: request.envelope.source.localId,
                     authority: request.binding.providerAuthority,
                     turn: {
                         attemptId: request.envelope.id,