@viewportai/daemon 0.20.1 → 0.22.0

package/dist/workflows/runtime-helpers.js

@@ -1,6 +1,7 @@
 import { spawn } from 'node:child_process';
 import path from 'node:path';
-import { buildExpressionContext, renderTemplateString, WorkflowExpressionError, } from './expression.js';
+import { buildExpressionContext, evaluateExpression, renderTemplateString, WorkflowExpressionError, } from './expression.js';
+import { cleanChildProcessEnv } from '../security/child-env.js';
 const MAX_OUTPUT_CHARS = 32_000;
 const MAX_LOG_CHUNK_CHARS = 4_000;
 export class ShellNodeError extends Error {
@@ -75,6 +76,44 @@ export async function renderTemplate(template, run, extras) {
         throw error;
     }
 }
+/**
+ * Render shell command templates without letting workflow inputs/outputs become
+ * raw shell syntax. Unquoted placeholder values are shell-quoted argv fragments.
+ * Placeholders inside double quotes are escaped for that shell context so
+ * substitutions such as $() and backticks remain literal text.
+ */
+export async function renderShellCommandTemplate(template, run, extras) {
+    const rewritten = applyLegacyTemplateAliases(template);
+    const context = { ...buildArtifactAwareContext(run), ...(extras ?? {}) };
+    const placeholderPattern = /\{\{\s*([\s\S]+?)\s*\}\}/g;
+    const matches = [];
+    let match;
+    while ((match = placeholderPattern.exec(rewritten)) !== null) {
+        matches.push({
+            index: match.index,
+            length: match[0].length,
+            expression: match[1] ?? '',
+            insideDoubleQuotes: isInsideDoubleQuotedShellSpan(rewritten, match.index),
+        });
+    }
+    if (matches.length === 0)
+        return rewritten;
+    const resolved = await Promise.all(matches.map((entry) => evaluateExpression(entry.expression, context).catch((error) => {
+        if (error instanceof WorkflowExpressionError)
+            throw error;
+        throw new WorkflowExpressionError(error instanceof Error ? error.message : String(error), entry.expression, error);
+    })));
+    let result = '';
+    let cursor = 0;
+    matches.forEach((entry, idx) => {
+        result += rewritten.slice(cursor, entry.index);
+        const rendered = stringifyShellTemplateValue(resolved[idx]);
+        result += entry.insideDoubleQuotes ? shellDoubleQuoteEscape(rendered) : shellQuote(rendered);
+        cursor = entry.index + entry.length;
+    });
+    result += rewritten.slice(cursor);
+    return result;
+}
 const LEGACY_OUTPUTS_PATTERN = /\{\{\s*outputs\.([A-Za-z0-9._/-]+)\s*\}\}/g;
 const LEGACY_ARTIFACTS_PATTERN = /\{\{\s*artifacts\.([A-Za-z0-9._/-]+)\.([A-Za-z0-9._/-]+)\s*\}\}/g;
 function applyLegacyTemplateAliases(template) {
@@ -82,6 +121,52 @@ function applyLegacyTemplateAliases(template) {
         .replace(LEGACY_OUTPUTS_PATTERN, (_match, nodeId) => `{{ nodes.${nodeId}.output }}`)
         .replace(LEGACY_ARTIFACTS_PATTERN, (_match, nodeId, name) => `{{ artifacts[nodeId='${nodeId}' and name='${name}'].path }}`);
 }
+function isInsideDoubleQuotedShellSpan(value, offset) {
+    let inSingle = false;
+    let inDouble = false;
+    let escaped = false;
+    for (let idx = 0; idx < offset; idx += 1) {
+        const char = value[idx];
+        if (escaped) {
+            escaped = false;
+            continue;
+        }
+        if (char === '\\') {
+            escaped = true;
+            continue;
+        }
+        if (char === "'" && !inDouble) {
+            inSingle = !inSingle;
+            continue;
+        }
+        if (char === '"' && !inSingle) {
+            inDouble = !inDouble;
+        }
+    }
+    return inDouble;
+}
+function shellQuote(value) {
+    if (value.length === 0)
+        return "''";
+    return `'${value.replace(/'/g, `'\\''`)}'`;
+}
+function shellDoubleQuoteEscape(value) {
+    return value.replace(/["\\$`]/g, (char) => `\\${char}`);
+}
+function stringifyShellTemplateValue(value) {
+    if (value === undefined || value === null)
+        return '';
+    if (typeof value === 'string')
+        return value;
+    if (typeof value === 'number' || typeof value === 'boolean')
+        return String(value);
+    try {
+        return JSON.stringify(value);
+    }
+    catch {
+        return String(value);
+    }
+}
 function buildArtifactAwareContext(run) {
     const base = buildExpressionContext(run);
     return {
@@ -95,10 +180,20 @@ function buildArtifactAwareContext(run) {
     };
 }
 export async function runShellNode(command, options) {
+    return await runProcessNode('sh', ['-lc', command], options);
+}
+export async function runArgvNode(argv, options) {
+    const [file, ...args] = argv;
+    if (!file || file.trim() === '') {
+        throw new ShellNodeError('Structured argv command is empty', '', null);
+    }
+    return await runProcessNode(file, args, options);
+}
+async function runProcessNode(file, args, options) {
     return await new Promise((resolve, reject) => {
-        const child = spawn('sh', ['-lc', command], {
+        const child = spawn(file, args, {
             cwd: options.cwd,
-            env: options.env ? { ...process.env, ...options.env } : process.env,
+            env: cleanChildProcessEnv(options.env),
             stdio: ['ignore', 'pipe', 'pipe'],
             detached: process.platform !== 'win32',
         });

package/dist/workflows/runtime-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-helpers.js","sourceRoot":"","sources":["../../src/workflows/runtime-helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runtime-helpers.js","sourceRoot":"","sources":["../../src/workflows/runtime-helpers.ts"],"names":[],"mappings":"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"}

package/dist/workflows/session-output.d.ts

@@ -1,4 +1,5 @@
 import type { SessionMessage } from '../core/types.js';
+import type { AgentAdapterDescriptor, AgentRunResult } from '../core/interfaces.js';
 import { type RichSessionMessage } from '../discovery/jsonl-reader.js';
 export interface TranscriptExcerptMessage {
     role: 'user' | 'assistant';
@@ -7,6 +8,14 @@ export interface TranscriptExcerptMessage {
 export interface SessionOutputCollector {
     push(message: SessionMessage): void;
     text(): string;
+    agentRunResult(options: {
+        agent: AgentAdapterDescriptor;
+        model?: string;
+        executionMode?: 'plan' | 'read_only' | 'implement' | 'review';
+        startedAt: number;
+        completedAt: number;
+        reason: string;
+    }): AgentRunResult;
 }
 export declare function createSessionOutputCollector(): SessionOutputCollector;
 export declare function outputFromRichMessages(messages: RichSessionMessage[]): string;

package/dist/workflows/session-output.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-output.d.ts","sourceRoot":"","sources":["../../src/workflows/session-output.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,8BAA8B,CAAC;AAItC,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CAAC;IACpC,IAAI,IAAI,MAAM,CAAC;CAChB;AAED,wBAAgB,4BAA4B,IAAI,sBAAsB,CAsBrE;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAQ7E;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,kBAAkB,EAAE,EAC9B,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAAO,GAClE,wBAAwB,EAAE,CAgB5B;AAED,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,wBAAgB,qCAAqC,CACnD,SAAS,EAAE,MAAM,GAChB,wBAAwB,EAAE,CAE5B;AAED,wBAAsB,8BAA8B,CAClD,YAAY,EAAE,MAAM,EACpB,UAAU,GAAE,MAAM,EAAO,GACxB,OAAO,CAAC,MAAM,CAAC,CAKjB;AAED,wBAAsB,yCAAyC,CAC7D,YAAY,EAAE,MAAM,EACpB,UAAU,GAAE,MAAM,EAAO,GACxB,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAKrC"}
+{"version":3,"file":"session-output.d.ts","sourceRoot":"","sources":["../../src/workflows/session-output.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,KAAK,EACV,sBAAsB,EACtB,cAAc,EAIf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,8BAA8B,CAAC;AAItC,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CAAC;IACpC,IAAI,IAAI,MAAM,CAAC;IACf,cAAc,CAAC,OAAO,EAAE;QACtB,KAAK,EAAE,sBAAsB,CAAC;QAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,aAAa,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,WAAW,GAAG,QAAQ,CAAC;QAC9D,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;KAChB,GAAG,cAAc,CAAC;CACpB;AAED,wBAAgB,4BAA4B,IAAI,sBAAsB,CAyIrE;AA4CD,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAQ7E;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,kBAAkB,EAAE,EAC9B,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAAO,GAClE,wBAAwB,EAAE,CAgB5B;AAED,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,wBAAgB,qCAAqC,CACnD,SAAS,EAAE,MAAM,GAChB,wBAAwB,EAAE,CAE5B;AAED,wBAAsB,8BAA8B,CAClD,YAAY,EAAE,MAAM,EACpB,UAAU,GAAE,MAAM,EAAO,GACxB,OAAO,CAAC,MAAM,CAAC,CAKjB;AAED,wBAAsB,yCAAyC,CAC7D,YAAY,EAAE,MAAM,EACpB,UAAU,GAAE,MAAM,EAAO,GACxB,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAKrC"}

package/dist/workflows/session-output.js

@@ -1,9 +1,16 @@
+import { createHash } from 'node:crypto';
 import { readRichSessionMessagesFromFile, } from '../discovery/jsonl-reader.js';
 import { readPersistedSessionMessagesRich } from '../server/ring-buffer.js';
 import { CodexDiscovery } from '../discovery/codex.js';
 export function createSessionOutputCollector() {
     const finalMessages = new Map();
     const chunkMessages = new Map();
+    const toolCalls = new Map();
+    const usage = {
+        available: false,
+        reason: 'stream_missing_final_usage',
+    };
+    const permissionDenials = [];
     return {
         push(message) {
             if (message.type === 'agent_message') {
@@ -14,6 +21,79 @@ export function createSessionOutputCollector() {
                 chunks.push(message.text);
                 chunkMessages.set(message.messageId, chunks);
             }
+            else if (message.type === 'token_usage') {
+                usage.available = true;
+                delete usage.reason;
+                usage.inputTokens = (usage.inputTokens ?? 0) + message.inputTokens;
+                usage.inputTokenScope =
+                    usage.inputTokenScope === 'raw_provider' || message.inputTokenScope === 'raw_provider'
+                        ? 'raw_provider'
+                        : 'billable';
+                usage.outputTokens = (usage.outputTokens ?? 0) + message.outputTokens;
+                usage.totalTokens = (usage.inputTokens ?? 0) + (usage.outputTokens ?? 0);
+                if (typeof message.cacheReadInputTokens === 'number') {
+                    usage.cacheReadInputTokens =
+                        (usage.cacheReadInputTokens ?? 0) + message.cacheReadInputTokens;
+                }
+                if (typeof message.cacheCreationInputTokens === 'number') {
+                    usage.cacheCreationInputTokens =
+                        (usage.cacheCreationInputTokens ?? 0) + message.cacheCreationInputTokens;
+                }
+                usage.billableInputTokens =
+                    typeof message.billableInputTokens === 'number'
+                        ? (usage.billableInputTokens ?? 0) + message.billableInputTokens
+                        : message.inputTokenScope === 'raw_provider'
+                            ? usage.billableInputTokens
+                            : Math.max(0, (usage.inputTokens ?? 0) - (usage.cacheReadInputTokens ?? 0));
+                usage.budgetedTotalTokens =
+                    typeof message.budgetedTotalTokens === 'number'
+                        ? (usage.budgetedTotalTokens ?? 0) + message.budgetedTotalTokens
+                        : message.inputTokenScope === 'raw_provider'
+                            ? (usage.budgetedTotalTokens ?? 0) + message.outputTokens
+                            : (usage.billableInputTokens ?? 0) + (usage.outputTokens ?? 0);
+                if (typeof message.totalCostUsd === 'number') {
+                    usage.totalCostUsd = (usage.totalCostUsd ?? 0) + message.totalCostUsd;
+                }
+                if (typeof message.durationMs === 'number') {
+                    usage.durationMs = Math.max(usage.durationMs ?? 0, message.durationMs);
+                }
+                if (typeof message.numTurns === 'number') {
+                    usage.numTurns = Math.max(usage.numTurns ?? 0, message.numTurns);
+                }
+                if (message.modelUsage) {
+                    usage.modelUsage = mergeModelUsage(usage.modelUsage, message.modelUsage);
+                }
+            }
+            else if (message.type === 'tool_call') {
+                toolCalls.set(message.toolCallId, {
+                    id: message.toolCallId,
+                    name: message.toolName,
+                    status: message.status,
+                    title: message.title,
+                    startedAt: message.timestamp,
+                    ...(message.input ? { inputDigest: digestRecord(message.input) } : {}),
+                });
+            }
+            else if (message.type === 'tool_call_update') {
+                const existing = toolCalls.get(message.toolCallId);
+                const status = message.status === 'error' ? 'error' : 'completed';
+                toolCalls.set(message.toolCallId, {
+                    id: message.toolCallId,
+                    name: message.toolName ?? existing?.name ?? 'unknown',
+                    status,
+                    title: message.title ?? existing?.title,
+                    startedAt: existing?.startedAt,
+                    completedAt: message.timestamp,
+                    inputDigest: existing?.inputDigest,
+                });
+                if (status === 'error') {
+                    permissionDenials.push({
+                        toolName: message.toolName ?? existing?.name ?? 'unknown',
+                        reason: message.output ?? 'tool error',
+                        timestamp: message.timestamp,
+                    });
+                }
+            }
         },
         text() {
             const chunksWithoutFinal = [...chunkMessages.entries()]
@@ -21,8 +101,84 @@ export function createSessionOutputCollector() {
                 .map(([, chunks]) => chunks.join(''));
             return [...chunksWithoutFinal, ...finalMessages.values()].join('').trim();
         },
+        agentRunResult(options) {
+            const output = this.text();
+            const executionMode = options.executionMode ?? 'implement';
+            const completedAt = new Date(options.completedAt).toISOString();
+            const startedAt = new Date(options.startedAt).toISOString();
+            return {
+                schema: 'viewport.agent_run_result/v1',
+                agentId: options.agent.agentId,
+                adapterVersion: options.agent.adapterVersion,
+                ...(options.model ? { model: options.model } : {}),
+                executionMode,
+                enforcement: {
+                    executionMode,
+                    planMode: options.agent.capabilities.executionModes.plan,
+                    readOnlyMode: options.agent.capabilities.executionModes.read_only,
+                    toolAllowlist: options.agent.capabilities.toolAllowlist,
+                    structuredOutput: options.agent.capabilities.structuredOutput,
+                    sandbox: 'hard',
+                },
+                output,
+                usage: usage.available === true
+                    ? { ...usage }
+                    : {
+                        available: false,
+                        reason: options.agent.capabilities.usageReporting === 'unavailable'
+                            ? 'adapter_no_usage'
+                            : 'stream_missing_final_usage',
+                    },
+                toolCalls: [...toolCalls.values()],
+                permissionDenials,
+                stopReason: normalizeStopReason(options.reason),
+                startedAt,
+                completedAt,
+                durationMs: Math.max(0, options.completedAt - options.startedAt),
+            };
+        },
     };
 }
+function normalizeStopReason(reason) {
+    if (reason === 'idle')
+        return 'idle';
+    if (reason === 'completed' || reason === 'ended')
+        return 'completed';
+    if (reason === 'timeout')
+        return 'timeout';
+    if (reason === 'killed' || reason === 'canceled')
+        return 'canceled';
+    if (reason.includes('permission'))
+        return 'tool_denied';
+    if (reason.startsWith('error'))
+        return 'error';
+    return 'unknown';
+}
+function mergeModelUsage(current, next) {
+    const merged = { ...(current ?? {}) };
+    for (const [model, value] of Object.entries(next)) {
+        const existing = merged[model];
+        merged[model] = {
+            inputTokens: (existing?.inputTokens ?? 0) + value.inputTokens,
+            outputTokens: (existing?.outputTokens ?? 0) + value.outputTokens,
+            costUsd: (existing?.costUsd ?? 0) + value.costUsd,
+            ...((existing?.cacheReadInputTokens ?? 0) + (value.cacheReadInputTokens ?? 0) > 0
+                ? {
+                    cacheReadInputTokens: (existing?.cacheReadInputTokens ?? 0) + (value.cacheReadInputTokens ?? 0),
+                }
+                : {}),
+            ...((existing?.cacheCreationInputTokens ?? 0) + (value.cacheCreationInputTokens ?? 0) > 0
+                ? {
+                    cacheCreationInputTokens: (existing?.cacheCreationInputTokens ?? 0) + (value.cacheCreationInputTokens ?? 0),
+                }
+                : {}),
+        };
+    }
+    return merged;
+}
+function digestRecord(input) {
+    return createHash('sha256').update(JSON.stringify(input)).digest('hex');
+}
 export function outputFromRichMessages(messages) {
     const text = [];
     for (const message of messages) {

package/dist/workflows/session-output.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-output.js","sourceRoot":"","sources":["../../src/workflows/session-output.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-output.js","sourceRoot":"","sources":["../../src/workflows/session-output.ts"],"names":[],"mappings":"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"}

package/dist/workflows/session-policy.d.ts

@@ -0,0 +1,30 @@
+import type { SessionExecutionMode } from '../core/types.js';
+export declare const WORKFLOW_SESSION_TIMEOUT_DEFAULTS_SECONDS: Record<SessionExecutionMode, number>;
+export interface ResolvedWorkflowSessionPolicy {
+    executionMode: SessionExecutionMode;
+    timeoutSeconds: number;
+    executionModeDefaulted: boolean;
+    timeoutDefaulted: boolean;
+}
+export interface WorkflowSessionBudget {
+    maxTokens?: number;
+    maxCostUsd?: number;
+    maxTurns?: number;
+}
+export declare function resolveWorkflowSessionPolicy(input: {
+    executionMode?: SessionExecutionMode;
+    timeoutSeconds?: number;
+    defaultExecutionMode?: SessionExecutionMode;
+}): ResolvedWorkflowSessionPolicy;
+export declare function resolveInlineAgentExecutionMode(input: {
+    explicitExecutionMode?: SessionExecutionMode;
+    parentExecutionMode?: SessionExecutionMode;
+}): SessionExecutionMode;
+export declare function resolveWorkflowSessionBudget(input: {
+    maxTokens?: number;
+    tokens?: number;
+    maxCostUsd?: number;
+    usd?: number;
+    maxTurns?: number;
+} | undefined): WorkflowSessionBudget | undefined;
+//# sourceMappingURL=session-policy.d.ts.map

package/dist/workflows/session-policy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-policy.d.ts","sourceRoot":"","sources":["../../src/workflows/session-policy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,eAAO,MAAM,yCAAyC,EAAE,MAAM,CAAC,oBAAoB,EAAE,MAAM,CAK1F,CAAC;AAEF,MAAM,WAAW,6BAA6B;IAC5C,aAAa,EAAE,oBAAoB,CAAC;IACpC,cAAc,EAAE,MAAM,CAAC;IACvB,sBAAsB,EAAE,OAAO,CAAC;IAChC,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE;IAClD,aAAa,CAAC,EAAE,oBAAoB,CAAC;IACrC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;CAC7C,GAAG,6BAA6B,CAShC;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE;IACrD,qBAAqB,CAAC,EAAE,oBAAoB,CAAC;IAC7C,mBAAmB,CAAC,EAAE,oBAAoB,CAAC;CAC5C,GAAG,oBAAoB,CAavB;AAED,wBAAgB,4BAA4B,CAC1C,KAAK,EACD;IACE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GACD,SAAS,GACZ,qBAAqB,GAAG,SAAS,CAUnC"}

package/dist/workflows/session-policy.js

@@ -0,0 +1,45 @@
+export const WORKFLOW_SESSION_TIMEOUT_DEFAULTS_SECONDS = {
+    plan: 600,
+    read_only: 900,
+    review: 900,
+    implement: 1800,
+};
+export function resolveWorkflowSessionPolicy(input) {
+    const executionMode = input.executionMode ?? input.defaultExecutionMode ?? 'implement';
+    return {
+        executionMode,
+        timeoutSeconds: input.timeoutSeconds ?? WORKFLOW_SESSION_TIMEOUT_DEFAULTS_SECONDS[executionMode],
+        executionModeDefaulted: input.executionMode === undefined,
+        timeoutDefaulted: input.timeoutSeconds === undefined,
+    };
+}
+export function resolveInlineAgentExecutionMode(input) {
+    if (input.explicitExecutionMode)
+        return input.explicitExecutionMode;
+    switch (input.parentExecutionMode) {
+        case 'plan':
+            return 'plan';
+        case 'read_only':
+            return 'read_only';
+        case 'review':
+            return 'review';
+        case 'implement':
+        case undefined:
+            return 'review';
+    }
+}
+export function resolveWorkflowSessionBudget(input) {
+    const maxTokens = positiveNumber(input?.maxTokens ?? input?.tokens);
+    const maxCostUsd = positiveNumber(input?.maxCostUsd ?? input?.usd);
+    const maxTurns = positiveNumber(input?.maxTurns);
+    const budget = {
+        ...(maxTokens !== undefined ? { maxTokens } : {}),
+        ...(maxCostUsd !== undefined ? { maxCostUsd } : {}),
+        ...(maxTurns !== undefined ? { maxTurns } : {}),
+    };
+    return Object.keys(budget).length > 0 ? budget : undefined;
+}
+function positiveNumber(value) {
+    return typeof value === 'number' && Number.isFinite(value) && value > 0 ? value : undefined;
+}
+//# sourceMappingURL=session-policy.js.map

package/dist/workflows/session-policy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-policy.js","sourceRoot":"","sources":["../../src/workflows/session-policy.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,yCAAyC,GAAyC;IAC7F,IAAI,EAAE,GAAG;IACT,SAAS,EAAE,GAAG;IACd,MAAM,EAAE,GAAG;IACX,SAAS,EAAE,IAAI;CAChB,CAAC;AAeF,MAAM,UAAU,4BAA4B,CAAC,KAI5C;IACC,MAAM,aAAa,GAAG,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,oBAAoB,IAAI,WAAW,CAAC;IACvF,OAAO;QACL,aAAa;QACb,cAAc,EACZ,KAAK,CAAC,cAAc,IAAI,yCAAyC,CAAC,aAAa,CAAC;QAClF,sBAAsB,EAAE,KAAK,CAAC,aAAa,KAAK,SAAS;QACzD,gBAAgB,EAAE,KAAK,CAAC,cAAc,KAAK,SAAS;KACrD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,+BAA+B,CAAC,KAG/C;IACC,IAAI,KAAK,CAAC,qBAAqB;QAAE,OAAO,KAAK,CAAC,qBAAqB,CAAC;IACpE,QAAQ,KAAK,CAAC,mBAAmB,EAAE,CAAC;QAClC,KAAK,MAAM;YACT,OAAO,MAAM,CAAC;QAChB,KAAK,WAAW;YACd,OAAO,WAAW,CAAC;QACrB,KAAK,QAAQ;YACX,OAAO,QAAQ,CAAC;QAClB,KAAK,WAAW,CAAC;QACjB,KAAK,SAAS;YACZ,OAAO,QAAQ,CAAC;IACpB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,KAQa;IAEb,MAAM,SAAS,GAAG,cAAc,CAAC,KAAK,EAAE,SAAS,IAAI,KAAK,EAAE,MAAM,CAAC,CAAC;IACpE,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,EAAE,UAAU,IAAI,KAAK,EAAE,GAAG,CAAC,CAAC;IACnE,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACjD,MAAM,MAAM,GAA0B;QACpC,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjD,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnD,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAChD,CAAC;IACF,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7D,CAAC;AAED,SAAS,cAAc,CAAC,KAAc;IACpC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAC9F,CAAC"}

package/dist/workflows/structured-outputs.d.ts

@@ -1,4 +1,9 @@
 import type { WorkflowNode, WorkflowNodeRunState } from './types.js';
+export declare class WorkflowStructuredOutputError extends Error {
+    readonly outputName: string;
+    readonly reason: string;
+    constructor(outputName: string, reason: string);
+}
 /**
  * After a node finishes running, populate `state.outputs` based on the node's
  * declared output schema and the captured `state.output` text.

package/dist/workflows/structured-outputs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"structured-outputs.d.ts","sourceRoot":"","sources":["../../src/workflows/structured-outputs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,oBAAoB,EAA4B,MAAM,YAAY,CAAC;AAE/F;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,4BAA4B,CAChD,KAAK,EAAE,oBAAoB,EAC3B,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC,CAWf"}
+{"version":3,"file":"structured-outputs.d.ts","sourceRoot":"","sources":["../../src/workflows/structured-outputs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,oBAAoB,EAA4B,MAAM,YAAY,CAAC;AAU/F,qBAAa,6BAA8B,SAAQ,KAAK;IAEpD,QAAQ,CAAC,UAAU,EAAE,MAAM;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM;gBADd,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM;CAI1B;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,4BAA4B,CAChD,KAAK,EAAE,oBAAoB,EAC3B,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC,CAsDf"}

package/dist/workflows/structured-outputs.js

@@ -1,4 +1,13 @@
 import jsonata from 'jsonata';
+export class WorkflowStructuredOutputError extends Error {
+    outputName;
+    reason;
+    constructor(outputName, reason) {
+        super(`Structured output ${outputName} is invalid: ${reason}`);
+        this.outputName = outputName;
+        this.reason = reason;
+    }
+}
 /**
  * After a node finishes running, populate `state.outputs` based on the node's
  * declared output schema and the captured `state.output` text.
@@ -16,16 +25,63 @@ import jsonata from 'jsonata';
  *     collector will populate `run.artifacts` for the actual file content.
  */
 export async function captureNodeStructuredOutputs(state, node) {
-    if (!node.outputs || Object.keys(node.outputs).length === 0)
+    const definitions = structuredOutputDefinitions(node);
+    if (Object.keys(definitions).length === 0)
         return;
     const text = state.output ?? '';
     const parsedJson = parseJson(text);
     const collected = {};
-    for (const [name, definition] of Object.entries(node.outputs)) {
+    const receipt = {};
+    for (const [name, definition] of Object.entries(definitions)) {
+        const requirement = definition.requirement ?? 'optional';
+        if (requirement === 'unsupported') {
+            receipt[name] = {
+                requirement,
+                status: 'degraded',
+                reason: 'structured_output_unsupported',
+            };
+            continue;
+        }
         const source = await outputSource(text, parsedJson, definition);
-        collected[name] = coerceOutputValue(source, definition);
+        const value = coerceOutputValue(source, definition);
+        const invalidReason = invalidOutputReason(value, source, parsedJson, text, definition);
+        if (requirement === 'required' && invalidReason) {
+            receipt[name] = {
+                requirement,
+                status: 'invalid',
+                reason: invalidReason,
+            };
+            state.outputs = {};
+            state.status = 'failed';
+            state.error = `Required structured output ${name} is invalid: ${invalidReason}`;
+            state.metadata = {
+                ...(state.metadata ?? {}),
+                structuredOutputs: {
+                    schema: 'viewport.structured_outputs/v1',
+                    outputs: receipt,
+                },
+            };
+            throw new WorkflowStructuredOutputError(name, invalidReason);
+        }
+        collected[name] = value;
+        receipt[name] = invalidReason
+            ? { requirement, status: 'invalid', reason: invalidReason }
+            : { requirement, status: 'captured' };
     }
     state.outputs = collected;
+    state.metadata = {
+        ...(state.metadata ?? {}),
+        structuredOutputs: {
+            schema: 'viewport.structured_outputs/v1',
+            outputs: receipt,
+        },
+    };
+}
+function structuredOutputDefinitions(node) {
+    return {
+        ...(node.outputs ?? {}),
+        ...(node.outputSchema ?? {}),
+    };
 }
 async function outputSource(text, parsedJson, definition) {
     if (!definition.extract)
@@ -67,6 +123,29 @@ function coerceOutputValue(value, definition) {
             return stringifyValue(value);
     }
 }
+function invalidOutputReason(value, source, parsedJson, text, definition) {
+    if (source === undefined || source === null || stringifyValue(source).trim() === '') {
+        return 'missing';
+    }
+    switch (definition.type) {
+        case 'string':
+            return stringifyValue(value).trim() === '' ? 'missing' : null;
+        case 'json':
+            if (!definition.extract && parsedJson === undefined && text.trim() !== '') {
+                return 'malformed_json';
+            }
+            return value === undefined || value === null ? 'missing' : null;
+        case 'number':
+            return typeof value === 'number' && Number.isFinite(value) ? null : 'invalid_number';
+        case 'boolean':
+            return typeof value === 'boolean' ? null : 'invalid_boolean';
+        case 'file':
+        case 'artifact':
+            return stringifyValue(value).trim() === '' ? 'missing' : null;
+        default:
+            return null;
+    }
+}
 function parseJson(text) {
     const trimmed = text.trim();
     if (!trimmed)

package/dist/workflows/structured-outputs.js.map

@@ -1 +1 @@
-{"version":3,"file":"structured-outputs.js","sourceRoot":"","sources":["../../src/workflows/structured-outputs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"structured-outputs.js","sourceRoot":"","sources":["../../src/workflows/structured-outputs.ts"],"names":[],"mappings":"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"}