dominds 1.4.2 → 1.5.2

package/dist/apps-host/ipc-types.js

@@ -7,11 +7,6 @@ function isRecord(v) {
 function asString(v) {
     return typeof v === 'string' ? v : null;
 }
-function asNullableString(v) {
-    if (v === null)
-        return null;
-    return typeof v === 'string' ? v : null;
-}
 function asNullableNumber(v) {
     if (v === null)
         return null;
@@ -22,6 +17,82 @@ function asNullableNumber(v) {
 function asLanguageCode(v) {
     return v === 'zh' || v === 'en' ? v : null;
 }
+function isJsonPrimitive(value) {
+    return (typeof value === 'string' ||
+        typeof value === 'number' ||
+        typeof value === 'boolean' ||
+        value === null);
+}
+function isJsonValue(value) {
+    if (isJsonPrimitive(value))
+        return true;
+    if (Array.isArray(value))
+        return value.every((item) => isJsonValue(item));
+    if (!isRecord(value))
+        return false;
+    return Object.values(value).every((item) => isJsonValue(item));
+}
+function parseReminderState(v, at) {
+    if (!isRecord(v))
+        throw new Error(`Invalid ${at}: expected object`);
+    const content = asString(v['content']);
+    if (content === null)
+        throw new Error(`Invalid ${at}.content: required`);
+    const metaRaw = v['meta'];
+    if (metaRaw !== undefined && !isJsonValue(metaRaw)) {
+        throw new Error(`Invalid ${at}.meta: must be JSON-serializable`);
+    }
+    const echobackRaw = v['echoback'];
+    const echoback = echobackRaw === undefined ? undefined : typeof echobackRaw === 'boolean' ? echobackRaw : null;
+    if (echoback === null)
+        throw new Error(`Invalid ${at}.echoback: must be boolean`);
+    return { content, meta: metaRaw, echoback };
+}
+function parseReminderApplyRequest(v, at) {
+    if (!isRecord(v))
+        throw new Error(`Invalid ${at}: expected object`);
+    const kind = v['kind'];
+    const ownerRef = asString(v['ownerRef']);
+    if (!ownerRef)
+        throw new Error(`Invalid ${at}.ownerRef: required`);
+    if (kind === 'upsert') {
+        const content = asString(v['content']);
+        if (content === null)
+            throw new Error(`Invalid ${at}.content: required`);
+        const metaRaw = v['meta'];
+        if (metaRaw !== undefined && !isJsonValue(metaRaw)) {
+            throw new Error(`Invalid ${at}.meta: must be JSON-serializable`);
+        }
+        const positionRaw = v['position'];
+        const position = positionRaw === undefined
+            ? undefined
+            : typeof positionRaw === 'number' && Number.isFinite(positionRaw)
+                ? Math.floor(positionRaw)
+                : null;
+        if (position === null)
+            throw new Error(`Invalid ${at}.position: must be finite number`);
+        const echobackRaw = v['echoback'];
+        const echoback = echobackRaw === undefined ? undefined : typeof echobackRaw === 'boolean' ? echobackRaw : null;
+        if (echoback === null)
+            throw new Error(`Invalid ${at}.echoback: must be boolean`);
+        return {
+            kind: 'upsert',
+            ownerRef,
+            content,
+            meta: metaRaw,
+            position,
+            echoback,
+        };
+    }
+    if (kind === 'delete') {
+        const metaRaw = v['meta'];
+        if (metaRaw !== undefined && !isJsonValue(metaRaw)) {
+            throw new Error(`Invalid ${at}.meta: must be JSON-serializable`);
+        }
+        return { kind: 'delete', ownerRef, meta: metaRaw };
+    }
+    throw new Error(`Invalid ${at}.kind: unsupported value ${String(kind)}`);
+}
 function parseAppsHostMessageFromKernel(v) {
     if (!isRecord(v))
         throw new Error('Invalid IPC message from kernel: expected object');
@@ -43,8 +114,9 @@ function parseAppsHostMessageFromKernel(v) {
         const port = typeof portRaw === 'number' && Number.isFinite(portRaw) ? Math.floor(portRaw) : null;
         if (!host)
             throw new Error('Invalid init message: kernel.host required');
-        if (port === null || port < 0)
+        if (port === null || port < 0) {
             throw new Error('Invalid init message: kernel.port must be non-negative number');
+        }
         if (!Array.isArray(apps))
             throw new Error('Invalid init message: apps must be array');
         const parsedApps = apps.map((a, idx) => {
@@ -54,7 +126,7 @@ function parseAppsHostMessageFromKernel(v) {
             const runtimePortRaw = asNullableNumber(a['runtimePort']);
             const runtimePort = runtimePortRaw === null
                 ? null
-                : runtimePortRaw !== null && Number.isFinite(runtimePortRaw)
+                : Number.isFinite(runtimePortRaw)
                     ? Math.floor(runtimePortRaw)
                     : null;
             if (!appId)
@@ -63,8 +135,9 @@ function parseAppsHostMessageFromKernel(v) {
                 throw new Error(`Invalid init message: apps[${idx}].runtimePort must be non-negative number|null`);
             }
             const installJson = a['installJson'];
-            if (!isRecord(installJson))
+            if (!isRecord(installJson)) {
                 throw new Error(`Invalid init message: apps[${idx}].installJson must be object`);
+            }
             return { appId, runtimePort, installJson: installJson };
         });
         return { type: 'init', rtwsRootAbs, kernel: { host, port }, apps: parsedApps };
@@ -83,17 +156,132 @@ function parseAppsHostMessageFromKernel(v) {
         if (!isRecord(ctx))
             throw new Error('Invalid tool_call message: ctx must be object');
         const dialogId = asString(ctx['dialogId']);
+        const rootDialogId = asString(ctx['rootDialogId']);
+        const agentId = asString(ctx['agentId']);
+        const sessionSlugRaw = ctx['sessionSlug'];
+        const sessionSlug = sessionSlugRaw === undefined
+            ? undefined
+            : typeof sessionSlugRaw === 'string'
+                ? sessionSlugRaw
+                : null;
         const callerId = asString(ctx['callerId']);
         if (!dialogId)
             throw new Error('Invalid tool_call message: ctx.dialogId required');
+        if (!rootDialogId)
+            throw new Error('Invalid tool_call message: ctx.rootDialogId required');
+        if (!agentId)
+            throw new Error('Invalid tool_call message: ctx.agentId required');
+        if (sessionSlugRaw !== undefined && !sessionSlug) {
+            throw new Error('Invalid tool_call message: ctx.sessionSlug must be string when present');
+        }
         if (!callerId)
             throw new Error('Invalid tool_call message: ctx.callerId required');
+        const normalizedSessionSlug = sessionSlug ?? undefined;
         return {
             type: 'tool_call',
             callId,
             toolName,
             args: args,
-            ctx: { dialogId, callerId },
+            ctx: { dialogId, rootDialogId, agentId, sessionSlug: normalizedSessionSlug, callerId },
+        };
+    }
+    if (type === 'reminder_apply') {
+        const callId = asString(v['callId']);
+        const appId = asString(v['appId']);
+        const ownerRef = asString(v['ownerRef']);
+        const request = v['request'];
+        const ctx = v['ctx'];
+        if (!callId)
+            throw new Error('Invalid reminder_apply message: callId required');
+        if (!appId)
+            throw new Error('Invalid reminder_apply message: appId required');
+        if (!ownerRef)
+            throw new Error('Invalid reminder_apply message: ownerRef required');
+        if (!isRecord(ctx))
+            throw new Error('Invalid reminder_apply message: ctx must be object');
+        const dialogId = asString(ctx['dialogId']);
+        const ownedRemindersRaw = ctx['ownedReminders'];
+        if (!dialogId)
+            throw new Error('Invalid reminder_apply message: ctx.dialogId required');
+        if (!Array.isArray(ownedRemindersRaw)) {
+            throw new Error('Invalid reminder_apply message: ctx.ownedReminders must be array');
+        }
+        return {
+            type: 'reminder_apply',
+            callId,
+            appId,
+            ownerRef,
+            request: parseReminderApplyRequest(request, 'reminder_apply.request'),
+            ctx: {
+                dialogId,
+                ownedReminders: ownedRemindersRaw.map((item, index) => parseReminderState(item, `reminder_apply.ctx.ownedReminders[${index}]`)),
+            },
+        };
+    }
+    if (type === 'reminder_update') {
+        const callId = asString(v['callId']);
+        const appId = asString(v['appId']);
+        const ownerRef = asString(v['ownerRef']);
+        const ctx = v['ctx'];
+        if (!callId)
+            throw new Error('Invalid reminder_update message: callId required');
+        if (!appId)
+            throw new Error('Invalid reminder_update message: appId required');
+        if (!ownerRef)
+            throw new Error('Invalid reminder_update message: ownerRef required');
+        if (!isRecord(ctx))
+            throw new Error('Invalid reminder_update message: ctx must be object');
+        const dialogId = asString(ctx['dialogId']);
+        if (!dialogId)
+            throw new Error('Invalid reminder_update message: ctx.dialogId required');
+        return {
+            type: 'reminder_update',
+            callId,
+            appId,
+            ownerRef,
+            ctx: {
+                dialogId,
+                reminder: parseReminderState(ctx['reminder'], 'reminder_update.ctx.reminder'),
+            },
+        };
+    }
+    if (type === 'reminder_render') {
+        const callId = asString(v['callId']);
+        const appId = asString(v['appId']);
+        const ownerRef = asString(v['ownerRef']);
+        const ctx = v['ctx'];
+        if (!callId)
+            throw new Error('Invalid reminder_render message: callId required');
+        if (!appId)
+            throw new Error('Invalid reminder_render message: appId required');
+        if (!ownerRef)
+            throw new Error('Invalid reminder_render message: ownerRef required');
+        if (!isRecord(ctx))
+            throw new Error('Invalid reminder_render message: ctx must be object');
+        const dialogId = asString(ctx['dialogId']);
+        const reminderNoRaw = ctx['reminderNo'];
+        const reminderNo = typeof reminderNoRaw === 'number' && Number.isFinite(reminderNoRaw)
+            ? Math.floor(reminderNoRaw)
+            : null;
+        const workLanguage = asLanguageCode(ctx['workLanguage']);
+        if (!dialogId)
+            throw new Error('Invalid reminder_render message: ctx.dialogId required');
+        if (reminderNo === null || reminderNo <= 0) {
+            throw new Error('Invalid reminder_render message: ctx.reminderNo must be positive integer');
+        }
+        if (!workLanguage)
+            throw new Error('Invalid reminder_render message: ctx.workLanguage invalid');
+        return {
+            type: 'reminder_render',
+            callId,
+            appId,
+            ownerRef,
+            ctx: {
+                dialogId,
+                reminder: parseReminderState(ctx['reminder'], 'reminder_render.ctx.reminder'),
+                reminderNo,
+                workLanguage,
+            },
         };
     }
     if (type === 'run_control_apply') {
@@ -116,9 +304,8 @@ function parseAppsHostMessageFromKernel(v) {
         const genIterNo = typeof genIterNoRaw === 'number' && Number.isFinite(genIterNoRaw)
             ? Math.max(0, Math.floor(genIterNoRaw))
             : null;
-        if (genIterNo === null) {
+        if (genIterNo === null)
             throw new Error('Invalid run_control_apply payload: genIterNo required');
-        }
         if (source !== 'drive_dlg_by_user_msg' && source !== 'drive_dialog_by_user_answer') {
             throw new Error('Invalid run_control_apply payload: source invalid');
         }
@@ -132,9 +319,8 @@ function parseAppsHostMessageFromKernel(v) {
         const promptParsed = (() => {
             if (prompt === undefined)
                 return undefined;
-            if (!isRecord(prompt)) {
+            if (!isRecord(prompt))
                 throw new Error('Invalid run_control_apply payload: prompt must be object');
-            }
             const content = asString(prompt['content']);
             const msgId = asString(prompt['msgId']);
             const grammar = asString(prompt['grammar']);
@@ -153,13 +339,7 @@ function parseAppsHostMessageFromKernel(v) {
             if (!userLanguageCode) {
                 throw new Error('Invalid run_control_apply payload: prompt.userLanguageCode must be zh|en');
             }
-            return {
-                content,
-                msgId,
-                grammar: 'markdown',
-                userLanguageCode,
-                origin,
-            };
+            return { content, msgId, grammar: 'markdown', userLanguageCode, origin };
         })();
         const q4hRaw = payload['q4h'];
         const q4h = (() => {
@@ -169,16 +349,24 @@ function parseAppsHostMessageFromKernel(v) {
                 throw new Error('Invalid run_control_apply payload: q4h must be object');
             const questionId = asString(q4hRaw['questionId']);
             const continuationTypeRaw = asString(q4hRaw['continuationType']);
-            if (!questionId) {
+            if (!questionId)
                 throw new Error('Invalid run_control_apply payload: q4h.questionId required');
+            let continuationType;
+            if (continuationTypeRaw === 'answer') {
+                continuationType = 'answer';
+            }
+            else if (continuationTypeRaw === 'followup') {
+                continuationType = 'followup';
+            }
+            else if (continuationTypeRaw === 'retry') {
+                continuationType = 'retry';
+            }
+            else if (continuationTypeRaw === 'new_message') {
+                continuationType = 'new_message';
             }
-            if (continuationTypeRaw !== 'answer' &&
-                continuationTypeRaw !== 'followup' &&
-                continuationTypeRaw !== 'retry' &&
-                continuationTypeRaw !== 'new_message') {
+            else {
                 throw new Error('Invalid run_control_apply payload: q4h.continuationType invalid');
             }
-            const continuationType = continuationTypeRaw;
             return { questionId, continuationType };
         })();
         return {
@@ -186,10 +374,7 @@ function parseAppsHostMessageFromKernel(v) {
             callId,
             controlId,
             payload: {
-                dialog: {
-                    selfId: dialogSelfId,
-                    rootId: dialogRootId,
-                },
+                dialog: { selfId: dialogSelfId, rootId: dialogRootId },
                 genIterNo,
                 prompt: promptParsed,
                 source,

package/dist/cli/install.js

@@ -16,6 +16,7 @@ const node_path_1 = __importDefault(require("node:path"));
 const app_lock_file_1 = require("../apps/app-lock-file");
 const configuration_file_1 = require("../apps/configuration-file");
 const manifest_1 = require("../apps/manifest");
+const resolution_file_1 = require("../apps/resolution-file");
 const run_app_json_1 = require("../apps/run-app-json");
 const workspace_app_state_1 = require("../apps/workspace-app-state");
 function printHelp() {
@@ -24,7 +25,7 @@ function printHelp() {
 
 Options:
   --local              Treat <spec|path> as a local package directory (dev package)
-  --id <appId>         Require app id (must match app --json appId)
+  --id <appId>         Require app id (must match app --dominds-app appId)
   --enable             Remove the app from disabledApps after install
   --force              Reserved for future use; currently ignored
 
@@ -155,6 +156,25 @@ async function main() {
         },
     });
     await (0, app_lock_file_1.writeAppLockFileIfChanged)({ rtwsRootAbs, file: nextLock });
+    if (shouldUseLocal) {
+        const loadedResolution = await (0, resolution_file_1.loadAppsResolutionFile)({ rtwsRootAbs });
+        if (loadedResolution.kind === 'error') {
+            console.error(`Error: failed to read .apps/resolution.yaml: ${loadedResolution.errorText}`);
+            process.exit(1);
+            return;
+        }
+        const nextResolution = (0, resolution_file_1.upsertResolvedApp)({
+            existing: loadedResolution.file,
+            next: {
+                id: installJson.appId,
+                enabled: true,
+                source: { kind: 'local', pathAbs: localAbs },
+                assignedPort: null,
+                installJson,
+            },
+        });
+        await (0, resolution_file_1.writeAppsResolutionFileIfChanged)({ rtwsRootAbs, file: nextResolution });
+    }
     await (0, workspace_app_state_1.refreshAppsDerivedState)({ rtwsRootAbs });
     void args.force;
     console.log(shouldUseLocal