dominds 1.20.2 → 1.20.4

package/dist/server.js

@@ -42,7 +42,7 @@ exports.startServer = startServer;
  * - Provides `/api/*` endpoints and `/ws` WebSocket communication
  * - CLI bootstrap with optional cwd/port/host/mode parameters
  * - Development mode: `tsx --watch src/server.ts -p <port> --mode dev`
- * - Production mode: `node dist/server.js` (default port 5666)
+ * - Production mode: `node dist/server.js` (default port behavior: 5666-)
  */
 const path = __importStar(require("path"));
 const runtime_1 = require("./apps/runtime");
@@ -54,6 +54,7 @@ const reply_special_1 = require("./recovery/reply-special");
 const work_language_1 = require("./runtime/work-language");
 const auth_1 = require("./server/auth");
 const dominds_self_update_1 = require("./server/dominds-self-update");
+const port_selection_1 = require("./server/port-selection");
 const server_core_1 = require("./server/server-core");
 const websocket_handler_1 = require("./server/websocket-handler");
 require("./tools/builtins");
@@ -87,74 +88,131 @@ function parseArgs(argv) {
             i++;
             continue;
         }
+        if (a.startsWith('--port=')) {
+            out['p'] = a.slice('--port='.length);
+            continue;
+        }
         if (a === '-H' || a === '--host') {
             out['H'] = argv[i + 1];
             i++;
             continue;
         }
+        if (a.startsWith('--host=')) {
+            out['H'] = a.slice('--host='.length);
+            continue;
+        }
         if (a === '--mode') {
             out['mode'] = argv[i + 1];
             i++;
             continue;
         }
+        if (a.startsWith('--mode=')) {
+            out['mode'] = a.slice('--mode='.length);
+            continue;
+        }
     }
     return out;
 }
+function getErrnoCode(error) {
+    if (!(error instanceof Error))
+        return undefined;
+    const withCode = error;
+    return typeof withCode.code === 'string' ? withCode.code : undefined;
+}
 async function startServer(opts = {}) {
     const { language: resolvedLanguage, source } = (0, work_language_1.resolveWorkLanguage)({ env: process.env });
     (0, work_language_1.setWorkLanguage)(resolvedLanguage);
     // Get port and host from options
     const mode = opts.mode || 'prod';
-    const port = opts.port ?? 5666;
+    const preferredPort = opts.port ?? port_selection_1.DEFAULT_WEBUI_PORT;
+    const strictPort = opts.strictPort ?? opts.port !== undefined;
+    const portAutoDirection = opts.portAutoDirection ?? 'down';
     const host = opts.host || '127.0.0.1';
     const startBackendDriver = opts.startBackendDriver ?? true;
-    log.info(`Starting server in ${mode} mode on ${host}:${port} (working language: ${(0, work_language_1.getWorkLanguage)()} from ${source})`);
+    const portCandidates = (0, port_selection_1.buildWebuiPortCandidates)({
+        preferredPort,
+        strictPort,
+        direction: portAutoDirection,
+    });
+    log.info(`Starting server in ${mode} mode on ${host}:${preferredPort} (${strictPort ? 'strict port' : `auto port ${portAutoDirection}`}; working language: ${(0, work_language_1.getWorkLanguage)()} from ${source})`);
     // WebSocket clients set
     const clients = new Set();
-    // Create server configuration
-    const config = {
-        mode: mode === 'dev' ? 'development' : 'production',
-        staticRoot: 'webapp/dist',
-        host,
-        port,
-        clients,
-        auth: (0, auth_1.computeAuthConfig)({
-            mode: mode === 'dev' ? 'development' : 'production',
-            env: process.env,
-        }),
-    };
-    const auth = config.auth ?? { kind: 'disabled' };
-    // Create HTTP server
-    const httpServer = (0, server_core_1.createHttpServer)(config);
-    (0, dominds_self_update_1.configureDomindsSelfUpdate)({
-        host,
-        port,
-        mode: config.mode,
-        stopServer: async () => {
-            await httpServer.stop();
-        },
+    const serverMode = mode === 'dev' ? 'development' : 'production';
+    const auth = (0, auth_1.computeAuthConfig)({
+        mode: serverMode,
+        env: process.env,
     });
-    // Setup WebSocket server
-    (0, websocket_handler_1.setupWebSocketServer)(httpServer.getHttpServer(), clients, config.auth ?? { kind: 'disabled' }, (0, work_language_1.getWorkLanguage)(), config.mode);
-    // MCP is best-effort: startup must not be blocked by MCP config/server issues.
-    (0, supervisor_1.startMcpSupervisor)();
-    // Apps host is optional for server boot: app failures must stay loud, but they must not block WebUI startup.
+    let startedCore = null;
+    let boundPort = null;
+    for (const candidatePort of portCandidates) {
+        const config = {
+            mode: serverMode,
+            staticRoot: 'webapp/dist',
+            host,
+            port: candidatePort,
+            clients,
+            auth,
+        };
+        const candidateServer = (0, server_core_1.createHttpServer)(config);
+        try {
+            boundPort = await candidateServer.start();
+            (0, websocket_handler_1.setupWebSocketServer)(candidateServer.getHttpServer(), clients, auth, (0, work_language_1.getWorkLanguage)(), config.mode);
+            startedCore = candidateServer;
+            break;
+        }
+        catch (error) {
+            if (!strictPort && getErrnoCode(error) === 'EADDRINUSE') {
+                const nextDirection = portAutoDirection === 'down' ? 'lower' : 'higher';
+                log.warn(`WebUI port ${candidatePort} is already in use; trying the next ${nextDirection} port`);
+                continue;
+            }
+            if (boundPort !== null && startedCore === null) {
+                await candidateServer.stop();
+            }
+            throw error;
+        }
+    }
+    if (startedCore === null || boundPort === null) {
+        const boundText = (0, port_selection_1.formatWebuiPortScanBound)({
+            preferredPort,
+            direction: portAutoDirection,
+        });
+        throw new Error(`Failed to start WebUI: no available port found from ${preferredPort} ${boundText}`);
+    }
+    if (!strictPort && boundPort !== preferredPort) {
+        log.warn(`WebUI preferred port ${preferredPort} was unavailable; listening on ${boundPort}`);
+    }
     try {
-        await (0, runtime_1.initAppsRuntime)({ rtwsRootAbs: process.cwd(), kernel: { host, port } });
+        (0, dominds_self_update_1.configureDomindsSelfUpdate)({
+            host,
+            port: boundPort,
+            mode: serverMode,
+            stopServer: async () => {
+                await startedCore.stop();
+            },
+        });
+        // MCP is best-effort: startup must not be blocked by MCP config/server issues.
+        (0, supervisor_1.startMcpSupervisor)();
+        // Apps host is optional for server boot: app failures must stay loud, but they must not block WebUI startup.
+        try {
+            await (0, runtime_1.initAppsRuntime)({ rtwsRootAbs: process.cwd(), kernel: { host, port: boundPort } });
+        }
+        catch (error) {
+            log.warn('Apps runtime initialization failed during server startup; continuing without app runtime capabilities until the app issue is fixed', error instanceof Error ? error : new Error(String(error)));
+        }
+        // Crash recovery: any dialogs left in "proceeding" state are surfaced as interrupted/resumable.
+        await (0, dialog_display_state_1.reconcileDisplayStatesAfterRestart)();
+        await (0, reply_special_1.recoverPendingReplyTellaskCallsAfterRestart)();
+        // Tests may opt out so the process can shut down cleanly without a driver stop API.
+        if (startBackendDriver) {
+            void (0, kernel_driver_1.runBackendDriver)();
+        }
     }
     catch (error) {
-        log.warn('Apps runtime initialization failed during server startup; continuing without app runtime capabilities until the app issue is fixed', error instanceof Error ? error : new Error(String(error)));
+        await startedCore.stop();
+        throw error;
     }
-    // Crash recovery: any dialogs left in "proceeding" state are surfaced as interrupted/resumable.
-    await (0, dialog_display_state_1.reconcileDisplayStatesAfterRestart)();
-    await (0, reply_special_1.recoverPendingReplyTellaskCallsAfterRestart)();
-    // Tests may opt out so the process can shut down cleanly without a driver stop API.
-    if (startBackendDriver) {
-        void (0, kernel_driver_1.runBackendDriver)();
-    }
-    // Start listening
-    await httpServer.start();
-    return { httpServer, auth, host, port, mode };
+    return { httpServer: startedCore, auth, host, port: boundPort, mode };
 }
 // Main function for CLI execution
 async function main() {
@@ -172,10 +230,17 @@ async function main() {
         }
     }
     // Get port, host, and mode from CLI args
-    const port = cliArgs['p'] ? Number(cliArgs['p']) : undefined;
+    const portSpecRaw = cliArgs['p'];
+    const parsedPort = typeof portSpecRaw === 'string' ? (0, port_selection_1.parseWebuiPortSpec)(portSpecRaw) : undefined;
+    if (portSpecRaw !== undefined && parsedPort === null) {
+        throw new Error('Invalid --port value: expected a port number, optionally suffixed with + or -');
+    }
+    const port = parsedPort?.port;
+    const strictPort = parsedPort?.strictPort;
+    const portAutoDirection = parsedPort?.portAutoDirection;
     const host = cliArgs['H'] || undefined;
     const mode = cliArgs['mode'] || undefined;
-    await startServer({ port, host, mode });
+    await startServer({ port, host, mode, strictPort, portAutoDirection });
 }
 // Start server if this file is run directly
 if (require.main === module) {

package/dist/team.d.ts

@@ -152,9 +152,8 @@ export declare namespace Team {
         setStreaming(streaming: boolean | undefined): void;
         setHidden(hidden: boolean | undefined): void;
         /**
-         * Returns a flat list of Tool objects by resolving toolsets and merging with individual tools.
-         * Honors declaration order of toolsets and tools. Logs warnings for duplicate tool names
-         * that resolve to different Tool objects. Returns no duplicate tools per name.
+         * Returns a flat list of assignable toolset names after expanding wildcards and exclusions.
+         * Honors declaration order and returns each toolset at most once.
          */
         listResolvedToolsetNames(options?: {
             onMissing?: 'warn' | 'silent';

package/dist/team.js

@@ -566,9 +566,8 @@ exports.Team = Team;
             this.hidden = hidden;
         }
         /**
-         * Returns a flat list of Tool objects by resolving toolsets and merging with individual tools.
-         * Honors declaration order of toolsets and tools. Logs warnings for duplicate tool names
-         * that resolve to different Tool objects. Returns no duplicate tools per name.
+         * Returns a flat list of assignable toolset names after expanding wildcards and exclusions.
+         * Honors declaration order and returns each toolset at most once.
          */
         listResolvedToolsetNames(options) {
             const onMissing = options?.onMissing ?? 'warn';
@@ -586,11 +585,12 @@ exports.Team = Team;
             }
             const resolved = [];
             const seen = new Set();
+            const isAssignableToolset = (name) => (0, registry_1.getToolsetMeta)(name)?.assignable !== false;
             for (const toolsetName of [...staticToolsets, ...dynamicToolsetNames]) {
                 if (toolsetName.startsWith('!'))
                     continue;
                 const toolsetNames = toolsetName === '*'
-                    ? Object.keys((0, registry_1.listToolsets)()).filter((n) => !excludedToolsets.has(n))
+                    ? Object.keys((0, registry_1.listToolsets)()).filter((n) => !excludedToolsets.has(n) && isAssignableToolset(n))
                     : excludedToolsets.has(toolsetName)
                         ? []
                         : [toolsetName];
@@ -611,6 +611,12 @@ exports.Team = Team;
                         }
                         continue;
                     }
+                    if (!isAssignableToolset(resolvedToolsetName)) {
+                        if (onMissing === 'warn') {
+                            log_1.log.warn(`Toolset '${resolvedToolsetName}' is intrinsic and cannot be assigned in team config for member '${this.id}'`);
+                        }
+                        continue;
+                    }
                     resolved.push(resolvedToolsetName);
                     seen.add(resolvedToolsetName);
                 }
@@ -818,6 +824,13 @@ exports.Team = Team;
                 for (const toolsetName of args.toolsets) {
                     const registeredMeta = (0, registry_1.getToolsetMeta)(toolsetName);
                     if (registeredToolsets.has(toolsetName)) {
+                        if (registeredMeta?.assignable === false) {
+                            addIssue(`${args.idPrefix}/toolsets/${sanitizeProblemIdSegment(toolsetName)}/not_assignable`, `Invalid .minds/team.yaml: ${args.atPrefix}.toolsets contains an intrinsic toolset that cannot be assigned.`, [
+                                `Resolved ${args.atPrefix}.toolsets includes '${toolsetName}', but '${toolsetName}' is injected by Dominds at runtime according to dialog scope.`,
+                                `Remove '${toolsetName}' from ${args.atPrefix}.toolsets; do not grant intrinsic tools through team config.`,
+                            ].join('\n'));
+                            continue;
+                        }
                         if (registeredMeta?.source === 'app') {
                             continue;
                         }

package/dist/tools/builtins.js

@@ -96,8 +96,10 @@ function manualSpecFor(toolsetId) {
 (0, registry_1.registerTool)(ctrl_1.deleteReminderTool);
 (0, registry_1.registerTool)(ctrl_1.updateReminderTool);
 (0, registry_1.registerTool)(ctrl_1.clearMindTool);
+(0, registry_1.registerTool)(ctrl_1.doMindTool);
 (0, registry_1.registerTool)(ctrl_1.changeMindTool);
 (0, registry_1.registerTool)(ctrl_1.mindMoreTool);
+(0, registry_1.registerTool)(ctrl_1.neverMindTool);
 (0, registry_1.registerTool)(ctrl_1.recallTaskdocTool);
 // Team management tools (scoped to `.minds/**`)
 for (const tool of team_mgmt_1.teamMgmtTools) {
@@ -139,12 +141,15 @@ for (const tool of team_mgmt_1.teamMgmtTools) {
     ctrl_1.deleteReminderTool,
     ctrl_1.updateReminderTool,
     ctrl_1.clearMindTool,
+    ctrl_1.doMindTool,
     ctrl_1.changeMindTool,
     ctrl_1.mindMoreTool,
+    ctrl_1.neverMindTool,
     ctrl_1.recallTaskdocTool,
 ]);
 (0, registry_1.setToolsetMeta)('control', {
     source: 'dominds',
+    assignable: false,
     descriptionI18n: {
         en: 'Dialog control: manage reminders, Taskdoc sections, and course resets.',
         zh: '对话控制：维护提醒项、差遣牒分段，并管理对话进程重置。',

package/dist/tools/ctrl.d.ts

@@ -1,20 +1,22 @@
 /**
  * Module: tools/ctrl
  *
- * Intrinsic dialog control tools - ALWAYS AVAILABLE TO ALL AGENTS
+ * Intrinsic dialog control tools.
  *
- * These tools are automatically included for every agent without needing to be
- * explicitly listed in team.yaml toolsets or tools configuration. They provide
- * core functionality for reminder management and mind control that should be
- * universally accessible.
+ * These tools are injected by runtime according to dialog scope without needing
+ * to be explicitly listed in team.yaml toolsets or tools configuration. Reminder
+ * and course-control tools are available in all dialog scopes; Taskdoc mutation
+ * tools are only exposed in Main Dialogs.
  *
  * INTRINSIC TOOLS:
  * - add_reminder: Add a reminder
  * - delete_reminder: Delete a reminder by id
  * - update_reminder: Update reminder content
  * - clear_mind: Start a new course, optionally add a reminder
- * - change_mind: Update a `.tsk/` Taskdoc section without starting a new course
- * - mind_more: Append entries to a `.tsk/` Taskdoc section without starting a new course
+ * - do_mind: Main Dialog only; create a new `.tsk/` Taskdoc section without starting a new course
+ * - change_mind: Main Dialog only; update a `.tsk/` Taskdoc section without starting a new course
+ * - mind_more: Main Dialog only; append entries to a `.tsk/` Taskdoc section without starting a new course
+ * - never_mind: Main Dialog only; delete a `.tsk/` Taskdoc section file without starting a new course
  * - recall_taskdoc: Read a Taskdoc section from `*.tsk/` by (category, selector)
  *
  * USAGE CONTEXT:
@@ -32,5 +34,7 @@ export declare const addReminderTool: FuncTool;
 export declare const updateReminderTool: FuncTool;
 export declare const clearMindTool: FuncTool;
 export declare const changeMindTool: FuncTool;
+export declare const doMindTool: FuncTool;
+export declare const neverMindTool: FuncTool;
 export declare const mindMoreTool: FuncTool;
 export declare const recallTaskdocTool: FuncTool;