@undefineds.co/models 0.2.15 → 0.2.18

package/dist/watch/index.js

@@ -1,3 +1,6 @@
+export const DEFAULT_WATCH_SECRETARY_REACTION_WINDOW_MS = 5000;
+export const MIN_WATCH_SECRETARY_REACTION_WINDOW_MS = 5000;
+export const MAX_WATCH_SECRETARY_REACTION_WINDOW_MS = 60000;
 export const WATCH_HOME_DIRNAME = 'watch';
 export const WATCH_SESSIONS_DIRNAME = 'sessions';
 export const WATCH_SESSION_FILE_NAME = 'session.json';
@@ -136,6 +139,97 @@ function normalizeAcpPermissionOptions(value) {
     }
     return value.filter((item) => isRecord(item));
 }
+export function normalizeWatchApprovalOptions(value) {
+    return normalizeAcpPermissionOptions(value)
+        .map((option) => {
+        const optionId = typeof option.optionId === 'string' && option.optionId.trim()
+            ? option.optionId.trim()
+            : undefined;
+        const label = firstNonEmpty([
+            typeof option.name === 'string' ? option.name : undefined,
+            typeof option.label === 'string' ? option.label : undefined,
+            optionId,
+        ]);
+        if (!optionId || !label) {
+            return null;
+        }
+        const kind = typeof option.kind === 'string' && option.kind.trim()
+            ? option.kind.trim()
+            : undefined;
+        const description = firstNonEmpty([
+            typeof option.description === 'string' ? option.description : undefined,
+            typeof option.detail === 'string' ? option.detail : undefined,
+        ]);
+        return {
+            optionId,
+            label,
+            ...(kind ? { kind } : {}),
+            ...(description ? { description } : {}),
+        };
+    })
+        .filter((option) => option !== null);
+}
+function normalizeDurationMs(value, unit) {
+    const numeric = typeof value === 'number'
+        ? value
+        : typeof value === 'string' && value.trim()
+            ? Number(value)
+            : Number.NaN;
+    if (!Number.isFinite(numeric) || numeric <= 0) {
+        return undefined;
+    }
+    const milliseconds = unit === 'ms'
+        ? numeric
+        : unit === 'seconds'
+            ? numeric * 1000
+            : numeric > 10000
+                ? numeric
+                : numeric * 1000;
+    return Math.round(milliseconds);
+}
+function normalizeIsoDatetime(value) {
+    if (value instanceof Date) {
+        return Number.isFinite(value.getTime()) ? value.toISOString() : undefined;
+    }
+    if (typeof value === 'number' && Number.isFinite(value)) {
+        const date = new Date(value);
+        return Number.isFinite(date.getTime()) ? date.toISOString() : undefined;
+    }
+    if (typeof value !== 'string' || !value.trim()) {
+        return undefined;
+    }
+    const date = new Date(value);
+    return Number.isFinite(date.getTime()) ? date.toISOString() : undefined;
+}
+function extractWatchApprovalTimeoutMs(params, raw) {
+    const meta = isRecord(params._meta)
+        ? params._meta
+        : isRecord(raw._meta)
+            ? raw._meta
+            : {};
+    return normalizeDurationMs(params.timeoutMs ?? meta.timeoutMs, 'ms')
+        ?? normalizeDurationMs(params.timeoutMillis ?? params.timeoutMilliseconds ?? meta.timeoutMillis ?? meta.timeoutMilliseconds, 'ms')
+        ?? normalizeDurationMs(params.timeoutSeconds ?? params.timeoutSec ?? meta.timeoutSeconds ?? meta.timeoutSec, 'seconds')
+        ?? normalizeDurationMs(params.timeout ?? meta.timeout, 'auto');
+}
+function extractWatchApprovalExpiresAt(params, raw) {
+    const meta = isRecord(params._meta)
+        ? params._meta
+        : isRecord(raw._meta)
+            ? raw._meta
+            : {};
+    return normalizeIsoDatetime(params.expiresAt ?? params.deadline ?? params.expires ?? meta.expiresAt ?? meta.deadline ?? meta.expires);
+}
+function extractWatchApprovalMetadata(raw, params) {
+    const approvalOptions = normalizeWatchApprovalOptions(params.options);
+    const timeoutMs = extractWatchApprovalTimeoutMs(params, raw);
+    const expiresAt = extractWatchApprovalExpiresAt(params, raw);
+    return {
+        ...(approvalOptions.length > 0 ? { approvalOptions } : {}),
+        ...(timeoutMs ? { timeoutMs } : {}),
+        ...(expiresAt ? { expiresAt } : {}),
+    };
+}
 function selectAcpPermissionOption(options, decision) {
     if (decision === 'cancel') {
         return undefined;
@@ -262,9 +356,241 @@ export function resolveWatchAutoApprovalDecision(input) {
     }
     return null;
 }
+export function createFallbackWatchSecretaryRecommendation(input) {
+    if (input.mode === 'manual' || input.request.kind === 'user-input') {
+        return null;
+    }
+    const decision = resolveWatchAutoApprovalDecision({
+        mode: input.mode,
+        request: input.request,
+    });
+    const secretaryDecision = decision === 'accept_for_session' ? 'accept' : decision;
+    if (!secretaryDecision) {
+        return null;
+    }
+    return {
+        kind: input.request.kind,
+        canAutoDecide: true,
+        decision: secretaryDecision,
+        confidence: input.mode === 'auto' ? 0.7 : 0.6,
+        reason: 'Matched local fallback policy while AI secretary was unavailable.',
+        reactionWindowMs: 0,
+        source: 'fallback',
+    };
+}
+export function parseWatchSecretaryRecommendation(text, options) {
+    const raw = parseJsonObjectFromText(text);
+    if (!raw) {
+        return null;
+    }
+    const canAutoDecide = booleanFromUnknown(raw.canAutoDecide
+        ?? raw.can_auto_decide
+        ?? raw.autoApprove
+        ?? raw.auto_approve
+        ?? raw.canAnswer
+        ?? raw.can_answer);
+    const confidence = normalizeConfidence(raw.confidence ?? raw.confidenceScore ?? raw.confidence_score);
+    const reason = stringFromUnknown(raw.reason ?? raw.rationale ?? raw.explanation);
+    const fallbackReactionWindowMs = options.defaultReactionWindowMs ?? DEFAULT_WATCH_SECRETARY_REACTION_WINDOW_MS;
+    const reactionWindowMs = confidence !== undefined
+        ? computeWatchSecretaryReactionWindowMs(confidence, fallbackReactionWindowMs)
+        : normalizeReactionWindowMs(raw.reactionWindowMs
+            ?? raw.reaction_window_ms
+            ?? raw.reviewWindowMs
+            ?? raw.review_window_ms
+            ?? raw.autoDecisionDelayMs
+            ?? raw.auto_decision_delay_ms, fallbackReactionWindowMs);
+    if (options.request.kind === 'user-input') {
+        const answers = normalizeSecretaryUserInputAnswers(options.request.questions, raw.answers ?? raw.answer ?? raw.userInputAnswers ?? raw.user_input_answers);
+        return {
+            kind: 'user-input',
+            canAutoDecide: canAutoDecide === true && !!answers,
+            ...(confidence !== undefined ? { confidence } : {}),
+            ...(reason ? { reason } : {}),
+            ...(reactionWindowMs !== undefined ? { reactionWindowMs } : {}),
+            ...(answers ? { answers } : {}),
+            source: 'model',
+        };
+    }
+    const decision = normalizeSecretaryApprovalDecision(raw.decision ?? raw.recommendedDecision ?? raw.recommended_decision);
+    if (!decision) {
+        return {
+            kind: options.request.kind,
+            canAutoDecide: false,
+            ...(confidence !== undefined ? { confidence } : {}),
+            ...(reason ? { reason } : {}),
+            ...(reactionWindowMs !== undefined ? { reactionWindowMs } : {}),
+            source: 'model',
+        };
+    }
+    return {
+        kind: options.request.kind,
+        canAutoDecide: canAutoDecide === true,
+        decision,
+        ...(confidence !== undefined ? { confidence } : {}),
+        ...(reason ? { reason } : {}),
+        ...(reactionWindowMs !== undefined ? { reactionWindowMs } : {}),
+        source: 'model',
+    };
+}
+export function watchApprovalDecisionLabel(decision) {
+    if (decision === 'accept') {
+        return 'Allow once';
+    }
+    if (decision === 'accept_for_session') {
+        return 'Grant';
+    }
+    if (decision === 'decline') {
+        return 'Deny';
+    }
+    return 'Cancel';
+}
+export function watchUserInputAnswersSummary(answers) {
+    return Object.entries(answers)
+        .map(([key, value]) => `${key}: ${value.answers.join(', ')}`)
+        .join('; ');
+}
+export function parseWatchGrantCoverageDecision(text) {
+    const raw = parseJsonObjectFromText(text);
+    if (!raw) {
+        return null;
+    }
+    const covers = booleanFromUnknown(raw.covers ?? raw.covered ?? raw.applies ?? raw.allowed);
+    if (covers === undefined) {
+        return null;
+    }
+    const confidence = normalizeConfidence(raw.confidence ?? raw.confidenceScore ?? raw.confidence_score);
+    const reason = stringFromUnknown(raw.reason ?? raw.rationale ?? raw.explanation);
+    return {
+        covers,
+        ...(confidence !== undefined ? { confidence } : {}),
+        ...(reason ? { reason } : {}),
+        source: 'model',
+    };
+}
 function isRecord(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
+function stringFromUnknown(value) {
+    return typeof value === 'string' && value.trim() ? value.trim() : undefined;
+}
+function booleanFromUnknown(value) {
+    if (typeof value === 'boolean') {
+        return value;
+    }
+    if (typeof value === 'string') {
+        const normalized = value.trim().toLowerCase();
+        if (['true', 'yes', 'y', '1'].includes(normalized)) {
+            return true;
+        }
+        if (['false', 'no', 'n', '0'].includes(normalized)) {
+            return false;
+        }
+    }
+    return undefined;
+}
+function normalizeConfidence(value) {
+    if (typeof value === 'number' && Number.isFinite(value)) {
+        if (value > 1 && value <= 100) {
+            return Math.max(0, Math.min(1, value / 100));
+        }
+        return Math.max(0, Math.min(1, value));
+    }
+    if (typeof value === 'string' && value.trim()) {
+        const parsed = Number(value);
+        return Number.isFinite(parsed) ? normalizeConfidence(parsed) : undefined;
+    }
+    return undefined;
+}
+function normalizeReactionWindowMs(value, fallback) {
+    const parsed = normalizeDurationMs(value ?? fallback, 'ms');
+    if (parsed === undefined) {
+        return undefined;
+    }
+    return Math.max(0, Math.min(MAX_WATCH_SECRETARY_REACTION_WINDOW_MS, parsed));
+}
+export function computeWatchSecretaryReactionWindowMs(confidence, fallback = DEFAULT_WATCH_SECRETARY_REACTION_WINDOW_MS) {
+    if (typeof confidence !== 'number' || !Number.isFinite(confidence)) {
+        return Math.max(0, Math.min(MAX_WATCH_SECRETARY_REACTION_WINDOW_MS, fallback));
+    }
+    const normalized = Math.max(0, Math.min(1, confidence));
+    const window = Math.round(MIN_WATCH_SECRETARY_REACTION_WINDOW_MS
+        + (1 - normalized) * (MAX_WATCH_SECRETARY_REACTION_WINDOW_MS - MIN_WATCH_SECRETARY_REACTION_WINDOW_MS));
+    return Math.max(MIN_WATCH_SECRETARY_REACTION_WINDOW_MS, Math.min(MAX_WATCH_SECRETARY_REACTION_WINDOW_MS, window));
+}
+function normalizeSecretaryApprovalDecision(value) {
+    if (typeof value !== 'string') {
+        return undefined;
+    }
+    const normalized = value.trim().toLowerCase().replace(/-/g, '_');
+    if (['accept', 'allow', 'allow_once', 'approve', 'yes', 'accept_for_session', 'allow_always', 'grant', 'session', 'approve_for_session'].includes(normalized)) {
+        return 'accept';
+    }
+    if (['decline', 'deny', 'reject', 'reject_once', 'reject_always', 'no'].includes(normalized)) {
+        return 'decline';
+    }
+    if (['cancel', 'abort'].includes(normalized)) {
+        return 'cancel';
+    }
+    return undefined;
+}
+function parseJsonObjectFromText(text) {
+    const trimmed = text.trim();
+    if (!trimmed) {
+        return null;
+    }
+    for (const candidate of [
+        trimmed,
+        extractFencedJson(trimmed),
+        extractBracedJson(trimmed),
+    ]) {
+        if (!candidate) {
+            continue;
+        }
+        try {
+            const parsed = JSON.parse(candidate);
+            return recordFromUnknown(parsed);
+        }
+        catch {
+            // Try the next extraction shape.
+        }
+    }
+    return null;
+}
+function extractFencedJson(text) {
+    const match = text.match(/```(?:json)?\s*([\s\S]*?)```/iu);
+    return match?.[1]?.trim() || null;
+}
+function extractBracedJson(text) {
+    const start = text.indexOf('{');
+    const end = text.lastIndexOf('}');
+    return start !== -1 && end > start ? text.slice(start, end + 1) : null;
+}
+function normalizeSecretaryUserInputAnswers(questions, rawAnswers) {
+    const source = recordFromUnknown(rawAnswers);
+    if (!source) {
+        return undefined;
+    }
+    const answers = {};
+    for (const question of questions) {
+        const raw = source[question.id] ?? source[question.header] ?? source[question.question];
+        const normalizedAnswers = normalizeSecretaryAnswerValues(raw);
+        if (normalizedAnswers.length > 0) {
+            answers[question.id] = { answers: normalizedAnswers };
+        }
+    }
+    return Object.keys(answers).length > 0 ? answers : undefined;
+}
+function normalizeSecretaryAnswerValues(value) {
+    const answerRecord = recordFromUnknown(value);
+    if (answerRecord) {
+        return normalizeSecretaryAnswerValues(answerRecord.answers ?? answerRecord.value ?? answerRecord.answer);
+    }
+    const values = Array.isArray(value) ? value : [value];
+    return values
+        .map((entry) => typeof entry === 'string' ? entry.trim() : '')
+        .filter(Boolean);
+}
 function firstNonEmpty(values) {
     for (const value of values) {
         if (typeof value === 'string' && value.trim()) {
@@ -433,6 +759,7 @@ export function normalizeCodexAppServerInteractionRequest(message) {
     const params = (typeof message.params === 'object' && message.params !== null
         ? message.params
         : {});
+    const approvalMetadata = extractWatchApprovalMetadata(message, params);
     if (method === 'item/commandExecution/requestApproval') {
         const command = typeof params.command === 'string' ? params.command : undefined;
         const cwd = typeof params.cwd === 'string' ? params.cwd : undefined;
@@ -441,6 +768,7 @@ export function normalizeCodexAppServerInteractionRequest(message) {
             message: command || 'Codex requests command approval',
             command,
             cwd,
+            ...approvalMetadata,
             raw: message,
         };
     }
@@ -450,6 +778,7 @@ export function normalizeCodexAppServerInteractionRequest(message) {
             kind: 'file-change-approval',
             message: reason && reason.trim() ? reason : 'Codex requests file-change approval',
             ...(reason ? { reason } : {}),
+            ...approvalMetadata,
             raw: message,
         };
     }
@@ -460,6 +789,7 @@ export function normalizeCodexAppServerInteractionRequest(message) {
             kind: 'permissions-approval',
             message: reason && reason.trim() ? reason : 'Codex requests additional permissions',
             permissions,
+            ...approvalMetadata,
             raw: message,
         };
     }
@@ -480,6 +810,7 @@ export function normalizeCodexAppServerInteractionRequest(message) {
         return {
             kind: 'codex-approval',
             message: 'Codex requests approval',
+            ...approvalMetadata,
             raw: message,
         };
     }
@@ -542,6 +873,7 @@ export function normalizeAcpInteractionRequest(message) {
     const method = typeof message.method === 'string' ? message.method.toLowerCase() : '';
     const params = (recordFromUnknown(message.params) ?? {});
     if (method === 'session/request_permission' || Array.isArray(params.options)) {
+        const approvalMetadata = extractWatchApprovalMetadata(message, params);
         const toolCall = (recordFromUnknown(params.toolCall) ?? {});
         const toolKind = typeof toolCall.kind === 'string' ? toolCall.kind : '';
         const command = extractAcpCommand(toolCall.rawInput);
@@ -563,6 +895,7 @@ export function normalizeAcpInteractionRequest(message) {
                 message: command ?? messageText,
                 ...(command ? { command } : {}),
                 ...(cwd ? { cwd } : {}),
+                ...approvalMetadata,
                 raw: message,
             };
         }
@@ -571,6 +904,7 @@ export function normalizeAcpInteractionRequest(message) {
                 kind: 'file-change-approval',
                 message: messageText,
                 reason: messageText,
+                ...approvalMetadata,
                 raw: message,
             };
         }
@@ -578,6 +912,7 @@ export function normalizeAcpInteractionRequest(message) {
             kind: 'permissions-approval',
             message: messageText,
             permissions: recordFromUnknown(toolCall.rawInput) ?? {},
+            ...approvalMetadata,
             raw: message,
         };
     }
@@ -788,6 +1123,7 @@ function maybeWatchApprovalEvent(json, lowerType) {
                     kind: 'permissions-approval',
                     message: message || 'Approval required',
                     permissions: json.permissions,
+                    ...extractWatchApprovalMetadata(json, json),
                     raw: json,
                 },
             }
@@ -1048,13 +1384,14 @@ export function buildWatchThreadMetadata(record) {
         backendSessionId: record.backendSessionId,
     };
 }
-function pushWatchTranscriptMessage(messages, role, content, createdAt) {
+function pushWatchTranscriptMessage(messages, role, source, content, createdAt) {
     const normalized = content?.replace(/\r/g, '').trimEnd();
     if (!normalized) {
         return;
     }
     messages.push({
         role,
+        source,
         content: normalized,
         createdAt,
     });
@@ -1065,7 +1402,7 @@ function flushWatchAssistantMessage(messages, state, fallbackTimestamp) {
         state.assistantTimestamp = undefined;
         return;
     }
-    pushWatchTranscriptMessage(messages, 'assistant', state.assistantText, state.assistantTimestamp ?? fallbackTimestamp);
+    pushWatchTranscriptMessage(messages, 'assistant', 'primary-agent', state.assistantText, state.assistantTimestamp ?? fallbackTimestamp);
     state.assistantText = '';
     state.assistantTimestamp = undefined;
 }
@@ -1079,7 +1416,7 @@ function appendWatchTranscriptEvent(messages, state, entry, event) {
     }
     if (event.type === 'assistant.done') {
         if (event.text && !state.assistantText) {
-            pushWatchTranscriptMessage(messages, 'assistant', event.text, entry.timestamp);
+            pushWatchTranscriptMessage(messages, 'assistant', 'primary-agent', event.text, entry.timestamp);
             return;
         }
         flushWatchAssistantMessage(messages, state, entry.timestamp);
@@ -1087,18 +1424,18 @@ function appendWatchTranscriptEvent(messages, state, entry, event) {
     }
     flushWatchAssistantMessage(messages, state, entry.timestamp);
     if (event.type === 'tool.call') {
-        pushWatchTranscriptMessage(messages, 'system', `[tool] ${event.name}${event.arguments ? ` ${JSON.stringify(event.arguments)}` : ''}`, entry.timestamp);
+        pushWatchTranscriptMessage(messages, 'system', 'tool', `[tool] ${event.name}${event.arguments ? ` ${JSON.stringify(event.arguments)}` : ''}`, entry.timestamp);
         return;
     }
     if (event.type === 'approval.required') {
-        pushWatchTranscriptMessage(messages, 'system', `[approval] ${event.message}`, entry.timestamp);
+        pushWatchTranscriptMessage(messages, 'system', 'secretary', `[approval] ${event.message}`, entry.timestamp);
         return;
     }
     if (event.type === 'input.required') {
-        pushWatchTranscriptMessage(messages, 'system', `[input] ${event.message}`, entry.timestamp);
+        pushWatchTranscriptMessage(messages, 'system', 'secretary', `[input] ${event.message}`, entry.timestamp);
         return;
     }
-    pushWatchTranscriptMessage(messages, 'system', `[note] ${event.message}`, entry.timestamp);
+    pushWatchTranscriptMessage(messages, 'system', 'system', `[note] ${event.message}`, entry.timestamp);
 }
 function appendWatchTranscriptRawEntry(messages, entry) {
     const trimmed = entry.line.trim();
@@ -1109,7 +1446,7 @@ function appendWatchTranscriptRawEntry(messages, entry) {
         const parsed = JSON.parse(trimmed);
         const type = typeof parsed.type === 'string' ? parsed.type : '';
         if (type === 'user.turn' && typeof parsed.text === 'string') {
-            pushWatchTranscriptMessage(messages, 'user', parsed.text, entry.timestamp);
+            pushWatchTranscriptMessage(messages, 'user', 'user', parsed.text, entry.timestamp);
             return;
         }
         if (type === 'turn.start') {
@@ -1117,24 +1454,24 @@ function appendWatchTranscriptRawEntry(messages, entry) {
             const args = Array.isArray(parsed.args)
                 ? parsed.args.filter((value) => typeof value === 'string')
                 : [];
-            pushWatchTranscriptMessage(messages, 'system', `[turn] ${[command, ...args].join(' ').trim()}`, entry.timestamp);
+            pushWatchTranscriptMessage(messages, 'system', 'system', `[turn] ${[command, ...args].join(' ').trim()}`, entry.timestamp);
             return;
         }
         if (type === 'credentials.resolve') {
             const requested = typeof parsed.requestedCredentialSource === 'string' ? parsed.requestedCredentialSource : 'auto';
             const resolved = typeof parsed.resolvedCredentialSource === 'string' ? parsed.resolvedCredentialSource : requested;
-            pushWatchTranscriptMessage(messages, 'system', `[credentials] ${requested} -> ${resolved}`, entry.timestamp);
+            pushWatchTranscriptMessage(messages, 'system', 'system', `[credentials] ${requested} -> ${resolved}`, entry.timestamp);
             return;
         }
         if (type === 'process.error' && typeof parsed.message === 'string') {
-            pushWatchTranscriptMessage(messages, 'system', `[error] ${parsed.message}`, entry.timestamp);
+            pushWatchTranscriptMessage(messages, 'system', 'system', `[error] ${parsed.message}`, entry.timestamp);
             return;
         }
     }
     catch {
         // Keep original line when it is not structured JSON.
     }
-    pushWatchTranscriptMessage(messages, 'system', entry.stream === 'stderr' ? `stderr> ${trimmed}` : trimmed, entry.timestamp);
+    pushWatchTranscriptMessage(messages, 'system', entry.stream === 'stderr' ? 'system' : 'primary-agent', entry.stream === 'stderr' ? `stderr> ${trimmed}` : trimmed, entry.timestamp);
 }
 export function buildWatchTranscriptMessages(entries) {
     const messages = [];

package/package.json

@@ -1,8 +1,10 @@
 {
   "name": "@undefineds.co/models",
-  "version": "0.2.15",
+  "version": "0.2.18",
   "private": false,
   "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -60,7 +62,7 @@
   "dependencies": {
     "@comunica/query-sparql-solid": "^4.0.2",
     "@inrupt/vocab-common-rdf": "^1.0.5",
-    "@undefineds.co/drizzle-solid": "^0.3.8",
+    "@undefineds.co/drizzle-solid": "^0.3.9",
     "n3": "^1.26.0",
     "zod": "^3.22.4"
   },
@@ -69,8 +71,6 @@
     "typescript": "^5.4.0",
     "vitest": "^1.6.0"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "files": [
     "dist",
     "README.md",