dominds 1.25.15 → 1.25.17

package/dist/cli/create.d.ts

@@ -10,5 +10,5 @@
  * - Template can be a short name (resolved via DOMINDS_TEMPLATE_BASE) or a git URL.
  * - rtws directory is `process.cwd()`. Use 'dominds -C <dir> create ...' to create under another base dir.
  */
-declare function main(): Promise<void>;
+declare function main(argv?: readonly string[]): Promise<void>;
 export { main };

package/dist/cli/create.js

@@ -201,9 +201,9 @@ async function runGit(args, cwd) {
     const detail = res.signal ? `signal ${res.signal}` : `exit code ${String(res.code)}`;
     throw new Error(`git failed (${detail}): ${res.cmd}`);
 }
-async function main() {
+async function main(argv = process.argv.slice(2)) {
     try {
-        const parsed = parseArgs(process.argv.slice(2));
+        const parsed = parseArgs(argv);
         switch (parsed.kind) {
             case 'help':
                 printHelp();

package/dist/cli/disable.d.ts

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-declare function main(): Promise<void>;
+declare function main(argv?: readonly string[]): Promise<void>;
 export { main };

package/dist/cli/disable.js

@@ -33,10 +33,10 @@ function parseArgs(argv) {
         throw new Error('disable requires exactly one <appId>');
     return { appId: positional[0] };
 }
-async function main() {
+async function main(argv = process.argv.slice(2)) {
     let args;
     try {
-        args = parseArgs(process.argv.slice(2));
+        args = parseArgs(argv);
     }
     catch (err) {
         console.error(err instanceof Error ? err.message : String(err));

package/dist/cli/doctor.d.ts

@@ -41,5 +41,5 @@ declare function runDoctor(params: {
     issues: ReadonlyArray<AppsResolutionIssue>;
     diagnoses: ReadonlyArray<AppDiagnosis>;
 }>;
-declare function main(): Promise<void>;
+declare function main(argv?: readonly string[]): Promise<void>;
 export { main, runDoctor };

package/dist/cli/doctor.js

@@ -240,10 +240,10 @@ function printDiagnosis(params) {
         console.log(`    - ${action}`);
     }
 }
-async function main() {
+async function main(argv = process.argv.slice(2)) {
     let args;
     try {
-        args = parseArgs(process.argv.slice(2));
+        args = parseArgs(argv);
     }
     catch (err) {
         console.error(err instanceof Error ? err.message : String(err));

package/dist/cli/enable.d.ts

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-declare function main(): Promise<void>;
+declare function main(argv?: readonly string[]): Promise<void>;
 export { main };

package/dist/cli/enable.js

@@ -33,10 +33,10 @@ function parseArgs(argv) {
         throw new Error('enable requires exactly one <appId>');
     return { appId: positional[0] };
 }
-async function main() {
+async function main(argv = process.argv.slice(2)) {
     let args;
     try {
-        args = parseArgs(process.argv.slice(2));
+        args = parseArgs(argv);
     }
     catch (err) {
         console.error(err instanceof Error ? err.message : String(err));

package/dist/cli/install.d.ts

@@ -5,5 +5,5 @@
  * Usage:
  *   dominds install <spec|path> [--local] [--id <appId>] [--enable] [--force]
  */
-declare function main(): Promise<void>;
+declare function main(argv?: readonly string[]): Promise<void>;
 export { main };

package/dist/cli/install.js

@@ -119,11 +119,11 @@ async function resolveInstallSource(params) {
     }
     return { kind: 'npx', spec: params.specOrPath };
 }
-async function main() {
+async function main(argv = process.argv.slice(2)) {
     const rtwsRootAbs = process.cwd();
     let args;
     try {
-        args = parseArgs(process.argv.slice(2));
+        args = parseArgs(argv);
     }
     catch (err) {
         console.error(err instanceof Error ? err.message : String(err));

package/dist/cli/manual.d.ts

@@ -11,4 +11,4 @@
  *   dominds man team_mgmt --topics index,tools
  */
 import '../tools/builtins';
-export declare function main(): Promise<void>;
+export declare function main(argv?: readonly string[]): Promise<void>;

package/dist/cli/manual.js

@@ -134,9 +134,9 @@ function listAvailableToolsets() {
     }
     console.log(`Available toolsets: ${names.map((name) => `\`${name}\``).join(', ')}`);
 }
-async function main() {
+async function main(argv = process.argv.slice(2)) {
     try {
-        const parsed = parseArgs(process.argv.slice(2));
+        const parsed = parseArgs(argv);
         if (parsed.list || !parsed.toolsetId) {
             listAvailableToolsets();
             return;

package/dist/cli/read.d.ts

@@ -13,5 +13,5 @@
  *   --find <pattern>     Find case-insensitive text in rendered output
  *   --help               Show help
  */
-declare function main(): Promise<void>;
+declare function main(args?: readonly string[]): Promise<void>;
 export { main };

package/dist/cli/read.js

@@ -437,8 +437,7 @@ function resolveTargetMemberIds(team, memberId) {
         throw new Error('No team members found.');
     return [fallback.id];
 }
-async function main() {
-    const args = process.argv.slice(2);
+async function main(args = process.argv.slice(2)) {
     let parsed;
     try {
         parsed = parseArgs(args);

package/dist/cli/tui.d.ts

@@ -14,5 +14,5 @@
  *   -p, --print-only: Non-interactive mode (for automated testing)
  *   --version: Show version information
  */
-declare function main(): Promise<void>;
+declare function main(argv?: readonly string[]): Promise<void>;
 export { main };

package/dist/cli/tui.js

@@ -166,10 +166,10 @@ function parseArgs(argv) {
     }
     return out;
 }
-async function main() {
+async function main(argv = process.argv.slice(2)) {
     try {
         (0, process_title_1.setRtwsProcessTitle)();
-        const args = parseArgs(process.argv.slice(2));
+        const args = parseArgs(argv);
         // Handle version flag
         if (args.version) {
             showVersion();

package/dist/cli/uninstall.d.ts

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-declare function main(): Promise<void>;
+declare function main(argv?: readonly string[]): Promise<void>;
 export { main };

package/dist/cli/uninstall.js

@@ -48,10 +48,10 @@ function parseArgs(argv) {
         throw new Error('uninstall requires exactly one <appId>');
     return { appId: positional[0], purge };
 }
-async function main() {
+async function main(argv = process.argv.slice(2)) {
     let args;
     try {
-        args = parseArgs(process.argv.slice(2));
+        args = parseArgs(argv);
     }
     catch (err) {
         console.error(err instanceof Error ? err.message : String(err));

package/dist/cli/update.d.ts

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-declare function main(): Promise<void>;
+declare function main(argv?: readonly string[]): Promise<void>;
 export { main };

package/dist/cli/update.js

@@ -36,10 +36,10 @@ function parseArgs(argv) {
         throw new Error('update accepts at most one <appId>');
     return { appId: positional[0] ?? null };
 }
-async function main() {
+async function main(argv = process.argv.slice(2)) {
     let args;
     try {
-        args = parseArgs(process.argv.slice(2));
+        args = parseArgs(argv);
     }
     catch (err) {
         console.error(err instanceof Error ? err.message : String(err));

package/dist/cli/validate-team-def.d.ts

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-export declare function main(): Promise<void>;
+export declare function main(argv?: readonly string[]): Promise<void>;

package/dist/cli/validate-team-def.js

@@ -50,10 +50,10 @@ function resolveTargetMemberIds(team, memberId) {
         throw new Error('No team members found.');
     return [fallback.id];
 }
-async function main() {
+async function main(argv = process.argv.slice(2)) {
     let parsed;
     try {
-        parsed = parseArgs(process.argv.slice(2));
+        parsed = parseArgs(argv);
     }
     catch (err) {
         console.error('Error:', err instanceof Error ? err.message : String(err));

package/dist/cli/webui.d.ts

@@ -11,5 +11,5 @@
  *   --nobrowser          Do not open a browser (opt-out)
  *   -h, --help           Show help
  */
-declare function main(): Promise<void>;
+declare function main(args?: readonly string[]): Promise<void>;
 export { main };

package/dist/cli/webui.js

@@ -63,9 +63,8 @@ function openInBrowser(url) {
     }
     (0, child_process_1.spawn)('xdg-open', [url], { stdio: 'ignore', detached: true }).unref();
 }
-async function main() {
+async function main(args = process.argv.slice(2)) {
     (0, process_title_1.setRtwsProcessTitle)();
-    const args = process.argv.slice(2);
     let port;
     let host = 'localhost';
     let mode = process.env.NODE_ENV === 'dev' ? 'dev' : 'prod';

package/dist/cli.d.ts

@@ -29,4 +29,4 @@
  */
 import './tools/builtins';
 export declare function configureEnvProxySupport(): void;
-export declare function main(): Promise<void>;
+export declare function main(argv?: readonly string[]): Promise<void>;

package/dist/cli.js

@@ -158,11 +158,11 @@ function printVersion() {
         console.log('dominds (version unknown)');
     }
 }
-async function main() {
+async function main(argv = process.argv.slice(2)) {
     const baseCwd = process.cwd();
     let parsed;
     try {
-        parsed = (0, rtws_cli_1.extractGlobalRtwsChdir)({ argv: process.argv.slice(2), baseCwd });
+        parsed = (0, rtws_cli_1.extractGlobalRtwsChdir)({ argv, baseCwd });
     }
     catch (err) {
         console.error('Error:', err instanceof Error ? err.message : String(err));
@@ -317,52 +317,46 @@ async function main() {
 async function runSubcommand(subcommand, args) {
     try {
         (0, process_title_1.setRtwsProcessTitle)();
-        // Save original argv
-        const originalArgv = process.argv;
-        // Set argv to simulate direct execution of the subcommand
-        process.argv = ['node', subcommand, ...args];
         if (subcommand === 'webui') {
-            await (0, webui_1.main)();
+            await (0, webui_1.main)(args);
         }
         else if (subcommand === 'tui') {
-            await (0, tui_1.main)();
+            await (0, tui_1.main)(args);
         }
         else if (subcommand === 'read') {
-            await (0, read_1.main)();
+            await (0, read_1.main)(args);
         }
         else if (subcommand === 'manual') {
-            await (0, manual_1.main)();
+            await (0, manual_1.main)(args);
         }
         else if (subcommand === 'validate_team_def') {
-            await (0, validate_team_def_1.main)();
+            await (0, validate_team_def_1.main)(args);
         }
         else if (subcommand === 'create') {
-            await (0, create_1.main)();
+            await (0, create_1.main)(args);
         }
         else if (subcommand === 'install') {
-            await (0, install_1.main)();
+            await (0, install_1.main)(args);
         }
         else if (subcommand === 'doctor') {
-            await (0, doctor_1.main)();
+            await (0, doctor_1.main)(args);
         }
         else if (subcommand === 'enable') {
-            await (0, enable_1.main)();
+            await (0, enable_1.main)(args);
         }
         else if (subcommand === 'disable') {
-            await (0, disable_1.main)();
+            await (0, disable_1.main)(args);
         }
         else if (subcommand === 'uninstall') {
-            await (0, uninstall_1.main)();
+            await (0, uninstall_1.main)(args);
         }
         else if (subcommand === 'update') {
-            await (0, update_1.main)();
+            await (0, update_1.main)(args);
         }
         else {
             console.error(`Error: Subcommand '${subcommand}' not implemented`);
             process.exit(1);
         }
-        // Restore original argv
-        process.argv = originalArgv;
     }
     catch (err) {
         console.error(`Failed to execute subcommand '${subcommand}':`, err);

package/dist/llm/kernel-driver/drive.js

@@ -302,28 +302,28 @@ function getUserOriginPromptMsgId(prompt) {
         ? prompt.msgId
         : undefined;
 }
-function samePendingUserInterjectionMsg(pending, msgId) {
-    return pending.msgId === msgId;
+function samePendingUserInterjectionCoordinate(left, right) {
+    return left.msgId === right.msgId && left.course === right.course && left.genseq === right.genseq;
 }
 async function maybeResolveAnsweredUserInterjection(args) {
     if (args.userPromptMsgId === undefined ||
         args.assistantSayingContent === null ||
         args.assistantSayingContent.trim() === '' ||
         args.assistantSayingGenseq === null) {
-        return;
+        return undefined;
     }
     for (const rawGenseq of args.functionCallGenseqs) {
         if (!Number.isFinite(rawGenseq) || rawGenseq <= 0) {
             continue;
         }
         if (args.assistantSayingGenseq <= Math.floor(rawGenseq)) {
-            return;
+            return undefined;
         }
     }
     const latest = await persistence_1.DialogPersistence.loadDialogLatest(args.dlg.id, args.dlg.status);
     const pending = latest?.pendingUserInterjectionReply;
-    if (pending === undefined || !samePendingUserInterjectionMsg(pending, args.userPromptMsgId)) {
-        return;
+    if (pending === undefined || pending.msgId !== args.userPromptMsgId) {
+        return undefined;
     }
     const course = args.dlg.activeGenCourseOrUndefined ?? args.dlg.currentCourse;
     const answerIdSource = [
@@ -369,14 +369,18 @@ async function maybeResolveAnsweredUserInterjection(args) {
         const userPromptMsgId = args.userPromptMsgId;
         if (previousPending === undefined ||
             userPromptMsgId === undefined ||
-            !samePendingUserInterjectionMsg(previousPending, userPromptMsgId)) {
+            userPromptMsgId !== pending.msgId ||
+            !samePendingUserInterjectionCoordinate(previousPending, pending)) {
             return { kind: 'noop' };
         }
+        const next = { ...previous };
+        delete next.pendingUserInterjectionReply;
         return {
-            kind: 'patch',
-            patch: { pendingUserInterjectionReply: undefined },
+            kind: 'replace',
+            next,
         };
     }, args.dlg.status);
+    return answer;
 }
 async function persistAndEmitRuntimeGuide(dlg, content) {
     await dlg.addChatMessages({
@@ -2207,6 +2211,9 @@ async function driveDialogStreamCore(dlg, callbacks, humanPrompt, driveOptions)
     let lastFunctionCallGenseq = null;
     let lastAssistantReplyTarget;
     let lastBusinessContinuation = { kind: 'none' };
+    let answeredUserInterjection;
+    let currentPromptIsUserInterjection = false;
+    let currentUserInterjectionReply;
     let fbrConclusion;
     let pubRemindersVer = dlg.remindersVer;
     let lastToolRoundStopDiagnostics;
@@ -2455,6 +2462,8 @@ async function driveDialogStreamCore(dlg, callbacks, humanPrompt, driveOptions)
                     }
                 }
                 lastBusinessContinuation = currentBusinessContinuation;
+                currentPromptIsUserInterjection = false;
+                currentUserInterjectionReply = undefined;
                 let generationBodyError;
                 let immediateFollowupTriggerExpectation;
                 const q4hAnswerCallId = normalizeQ4HAnswerCallId(currentPrompt?.q4hAnswerCallId);
@@ -2476,9 +2485,10 @@ async function driveDialogStreamCore(dlg, callbacks, humanPrompt, driveOptions)
                             language: promptLanguage,
                         });
                         const deferredReplyReassertionDirective = replyGuidance.deferredReplyReassertionDirective;
-                        const currentPromptIsUserInterjection = currentPrompt.origin === 'user' &&
-                            replyGuidance.suppressInterDialogReplyGuidance &&
-                            deferredReplyReassertionDirective !== undefined;
+                        currentPromptIsUserInterjection =
+                            currentPrompt.origin === 'user' &&
+                                replyGuidance.suppressInterDialogReplyGuidance &&
+                                deferredReplyReassertionDirective !== undefined;
                         if (currentPromptIsUserInterjection) {
                             // WARNING:
                             // User interjection suppression is a reversible state transition, not a one-shot
@@ -2490,13 +2500,29 @@ async function driveDialogStreamCore(dlg, callbacks, humanPrompt, driveOptions)
                             // Legacy blocked-Continue paths may also re-enter here. A repeated interjection MUST
                             // re-arm the deferred state and re-materialize the suppression guide, even when the
                             // underlying reply directive itself did not change.
+                            const deferredDirective = deferredReplyReassertionDirective;
+                            if (deferredDirective === undefined) {
+                                throw new Error(`kernel-driver user interjection invariant violation: missing deferred reply directive for dialog=${dlg.id.valueOf()} msgId=${currentPrompt.msgId}`);
+                            }
                             const existingDeferredReplyReassertion = await persistence_1.DialogPersistence.getDeferredReplyReassertion(dlg.id, dlg.status);
+                            currentUserInterjectionReply = {
+                                msgId: currentPrompt.msgId,
+                                course: (0, storage_1.toDialogCourseNumber)(dlg.activeGenCourseOrUndefined ?? dlg.currentCourse),
+                                genseq: (0, storage_1.toCallSiteGenseqNo)(dlg.activeGenSeq),
+                            };
                             const nextDeferredReplyReassertion = {
                                 reason: 'user_interjection_with_parked_original_task',
-                                directive: deferredReplyReassertionDirective,
+                                directive: deferredDirective,
+                                userInterjection: currentUserInterjectionReply,
                             };
                             const mustRearmDeferredReplyReassertion = existingDeferredReplyReassertion === undefined ||
                                 existingDeferredReplyReassertion.resumeGuideSurfaced === true ||
+                                existingDeferredReplyReassertion.userInterjection.msgId !==
+                                    nextDeferredReplyReassertion.userInterjection.msgId ||
+                                existingDeferredReplyReassertion.userInterjection.course !==
+                                    nextDeferredReplyReassertion.userInterjection.course ||
+                                existingDeferredReplyReassertion.userInterjection.genseq !==
+                                    nextDeferredReplyReassertion.userInterjection.genseq ||
                                 !hasSameReplyDirective(existingDeferredReplyReassertion.directive, nextDeferredReplyReassertion.directive);
                             if (mustRearmDeferredReplyReassertion) {
                                 await persistence_1.DialogPersistence.setDeferredReplyReassertion(dlg.id, nextDeferredReplyReassertion, dlg.status);
@@ -2528,13 +2554,15 @@ async function driveDialogStreamCore(dlg, callbacks, humanPrompt, driveOptions)
                             throw new Error(`kernel-driver reply guidance invariant violation: missing prompt content for dialog=${dlg.id.valueOf()} msgId=${currentPrompt.msgId}`);
                         }
                         if (currentPromptIsUserInterjection) {
+                            if (currentUserInterjectionReply === undefined) {
+                                throw new Error(`kernel-driver user interjection invariant violation: missing pending reply coordinate for dialog=${dlg.id.valueOf()} msgId=${currentPrompt.msgId}`);
+                            }
+                            const pendingUserInterjectionReply = currentUserInterjectionReply;
                             await persistence_1.DialogPersistence.mutateDialogLatest(dlg.id, () => ({
                                 kind: 'patch',
                                 patch: {
                                     pendingUserInterjectionReply: {
-                                        msgId: currentPrompt.msgId,
-                                        course: (0, storage_1.toDialogCourseNumber)(dlg.activeGenCourseOrUndefined ?? dlg.currentCourse),
-                                        genseq: (0, storage_1.toCallSiteGenseqNo)(dlg.activeGenSeq),
+                                        ...pendingUserInterjectionReply,
                                     },
                                 },
                             }), dlg.status);
@@ -3217,6 +3245,31 @@ async function driveDialogStreamCore(dlg, callbacks, humanPrompt, driveOptions)
                             lastFunctionCallGenseq = callGenseq;
                         }
                     }
+                    const userInterjectionMsgIdForVisibleAnswer = currentPrompt?.origin === 'user' && !isQ4HAnswerPrompt
+                        ? currentPrompt.msgId
+                        : currentGenerationBelongsToUserToolChain
+                            ? currentUserPromptMsgId
+                            : undefined;
+                    if (userInterjectionMsgIdForVisibleAnswer !== undefined) {
+                        const streamedCurrentRoundSayingContent = batchOutputs.length === 0 &&
+                            lastAssistantSayingGenseq !== previousAssistantSayingGenseq
+                            ? lastAssistantSayingContent
+                            : null;
+                        const streamedCurrentRoundSayingGenseq = batchOutputs.length === 0 &&
+                            lastAssistantSayingGenseq !== previousAssistantSayingGenseq
+                            ? lastAssistantSayingGenseq
+                            : null;
+                        const answer = await maybeResolveAnsweredUserInterjection({
+                            dlg,
+                            userPromptMsgId: userInterjectionMsgIdForVisibleAnswer,
+                            assistantSayingContent: currentRoundAssistantSayingContent ?? streamedCurrentRoundSayingContent,
+                            assistantSayingGenseq: currentRoundAssistantSayingGenseq ?? streamedCurrentRoundSayingGenseq,
+                            functionCallGenseqs: currentRoundFunctionCallGenseqs,
+                        });
+                        if (answer !== undefined) {
+                            answeredUserInterjection = answer;
+                        }
+                    }
                     const routed = await executeFunctionRound({
                         dlg,
                         agent,
@@ -3234,21 +3287,6 @@ async function driveDialogStreamCore(dlg, callbacks, humanPrompt, driveOptions)
                         newMsgs.push(...routed.pairedMessages);
                     }
                     await dlg.addChatMessages(...newMsgs);
-                    const streamedCurrentRoundSayingContent = batchOutputs.length === 0 && lastAssistantSayingGenseq !== previousAssistantSayingGenseq
-                        ? lastAssistantSayingContent
-                        : null;
-                    const streamedCurrentRoundSayingGenseq = batchOutputs.length === 0 && lastAssistantSayingGenseq !== previousAssistantSayingGenseq
-                        ? lastAssistantSayingGenseq
-                        : null;
-                    if (currentPrompt?.origin === 'user' && !isQ4HAnswerPrompt) {
-                        await maybeResolveAnsweredUserInterjection({
-                            dlg,
-                            userPromptMsgId: currentPrompt.msgId,
-                            assistantSayingContent: currentRoundAssistantSayingContent ?? streamedCurrentRoundSayingContent,
-                            assistantSayingGenseq: currentRoundAssistantSayingGenseq ?? streamedCurrentRoundSayingGenseq,
-                            functionCallGenseqs: currentRoundFunctionCallGenseqs,
-                        });
-                    }
                     const persistedFbrState = await loadDialogFbrState(dlg);
                     if (persistedFbrState) {
                         if (persistedFbrState.phase === 'finalization') {
@@ -3674,6 +3712,7 @@ async function driveDialogStreamCore(dlg, callbacks, humanPrompt, driveOptions)
         lastFunctionCallGenseq,
         lastAssistantReplyTarget,
         lastBusinessContinuation,
+        answeredUserInterjection,
         fbrConclusion,
     };
 }