dominds 1.25.1 → 1.25.3

package/dist/tools/os.js

@@ -11,6 +11,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDaemonOutputTool = exports.stopDaemonTool = exports.readonlyShellTool = exports.shellCmdTool = exports.shellCmdReminderOwner = void 0;
 exports.resetTrackedDaemonsForTests = resetTrackedDaemonsForTests;
+exports.resolveShellCmdSpawnSpecForTests = resolveShellCmdSpawnSpecForTests;
+exports.resolveReadonlyShellSpawnSpecForTests = resolveReadonlyShellSpawnSpecForTests;
 const time_1 = require("@longrun-ai/kernel/utils/time");
 const child_process_1 = require("child_process");
 const crypto_1 = __importDefault(require("crypto"));
@@ -816,9 +818,12 @@ function parseGetDaemonOutputArgs(args) {
     }
     return { pid, stdout, stderr };
 }
-function resolveShellCmdSpawnSpec(command, shell) {
+function encodePowerShellCommand(command) {
+    return Buffer.from(command, 'utf16le').toString('base64');
+}
+function resolveShellCmdSpawnSpec(command, shell, platform = process.platform) {
     const preferredShell = typeof shell === 'string' && shell.trim() !== '' ? shell.trim() : undefined;
-    if (process.platform === 'win32') {
+    if (platform === 'win32') {
         if (preferredShell) {
             const base = path_1.default.basename(preferredShell).toLowerCase();
             if (base === 'powershell' ||
@@ -827,14 +832,14 @@ function resolveShellCmdSpawnSpec(command, shell) {
                 base === 'pwsh.exe') {
                 return {
                     command: preferredShell,
-                    args: ['-NoLogo', '-NoProfile', '-Command', command],
+                    args: ['-NoLogo', '-NoProfile', '-EncodedCommand', encodePowerShellCommand(command)],
                     shellLabel: preferredShell,
                 };
             }
             if (base === 'cmd' || base === 'cmd.exe') {
                 return {
                     command: preferredShell,
-                    args: ['/d', '/s', '/c', command],
+                    args: ['/d', '/c', command],
                     shellLabel: preferredShell,
                 };
             }
@@ -846,7 +851,7 @@ function resolveShellCmdSpawnSpec(command, shell) {
         }
         return {
             command: 'cmd.exe',
-            args: ['/d', '/s', '/c', command],
+            args: ['/d', '/c', command],
             shellLabel: 'cmd.exe',
         };
     }
@@ -857,12 +862,18 @@ function resolveShellCmdSpawnSpec(command, shell) {
         shellLabel: resolvedShell,
     };
 }
-function resolveReadonlyShellSpawnSpec(command) {
-    if (process.platform === 'win32') {
-        return { command: 'cmd.exe', args: ['/d', '/s', '/c', command] };
+function resolveShellCmdSpawnSpecForTests(command, shell, platform) {
+    return resolveShellCmdSpawnSpec(command, shell, platform);
+}
+function resolveReadonlyShellSpawnSpec(command, platform = process.platform) {
+    if (platform === 'win32') {
+        return { command: 'cmd.exe', args: ['/d', '/c', command] };
     }
     return { command: 'bash', args: ['-c', command] };
 }
+function resolveReadonlyShellSpawnSpecForTests(command, platform) {
+    return resolveReadonlyShellSpawnSpec(command, platform);
+}
 function resolveCmdRunnerEntrypointAbs() {
     const distCandidate = path_1.default.resolve(__dirname, 'cmd-runner.js');
     if (fs_1.default.existsSync(distCandidate)) {
@@ -1105,7 +1116,7 @@ const shellCmdSchema = {
         },
         shell: {
             type: 'string',
-            description: 'Shell to use for execution (default: bash on Linux/macOS; cmd.exe on Windows)',
+            description: 'Shell to use for execution (default: bash on Linux/macOS; cmd.exe on Windows). On Windows, powershell.exe/pwsh commands are passed via -EncodedCommand.',
         },
         scrollbackLines: {
             type: 'number',

package/dist/tools/picture.d.ts

@@ -1,3 +1,4 @@
 import type { FuncTool } from '../tool';
 export declare const readPictureTool: FuncTool;
+export declare const fsReadPictureTool: FuncTool;
 export declare const writePictureTool: FuncTool;

package/dist/tools/picture.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writePictureTool = exports.readPictureTool = void 0;
+exports.writePictureTool = exports.fsReadPictureTool = exports.readPictureTool = void 0;
 const crypto_1 = require("crypto");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
@@ -33,6 +33,12 @@ function ensureInsideWorkspace(rel) {
     }
     throw new Error('Path must be within rtws (runtime workspace)');
 }
+function resolveLocalFilesystemPath(inputPath) {
+    return path_1.default.resolve(process.cwd(), inputPath);
+}
+function displayLocalFilesystemPath(inputPath, absPath) {
+    return path_1.default.isAbsolute(inputPath) ? absPath : inputPath;
+}
 function requirePathArg(args) {
     const value = args['path'];
     if (typeof value !== 'string' || value.trim() === '') {
@@ -246,6 +252,63 @@ exports.readPictureTool = {
         }
     },
 };
+exports.fsReadPictureTool = {
+    type: 'func',
+    name: 'fs_read_picture',
+    description: 'Read a PNG/JPEG/WebP/GIF image from the local filesystem without restricting paths to rtws, then attach it as an image content item for the next LLM context.',
+    descriptionI18n: {
+        en: 'Read a PNG/JPEG/WebP/GIF image from the local filesystem without restricting paths to rtws, then attach it as an image content item for the next LLM context.',
+        zh: '读取本机文件系统中的 PNG/JPEG/WebP/GIF 图片（不限制路径必须位于 rtws 内），并作为图片 content item 放入后续 LLM 上下文。',
+    },
+    parameters: {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+            path: {
+                type: 'string',
+                description: 'Image path to read. Absolute paths are accepted; relative paths resolve from the current process cwd. Supported extensions: .png, .jpg, .jpeg, .webp, .gif.',
+            },
+        },
+        required: ['path'],
+    },
+    argsValidation: 'dominds',
+    call: async (dlg, _caller, args) => {
+        try {
+            const requestedPath = requirePathArg(args);
+            const absPath = resolveLocalFilesystemPath(requestedPath);
+            const displayPath = displayLocalFilesystemPath(requestedPath, absPath);
+            const mimeType = extToMimeType(displayPath);
+            if (mimeType === null) {
+                return fail('Unsupported image extension. Supported extensions: .png, .jpg, .jpeg, .webp, .gif');
+            }
+            const stat = await promises_1.default.stat(absPath);
+            if (!stat.isFile())
+                return fail(`Path is not a file: ${displayPath}`);
+            if (stat.size <= 0 || stat.size > PICTURE_MAX_BYTES) {
+                return fail(`Image must be between 1 byte and ${String(PICTURE_MAX_BYTES)} bytes`);
+            }
+            const bytes = await promises_1.default.readFile(absPath);
+            validateImageBytesMatchMimeType(bytes, mimeType);
+            const item = await persistPictureArtifact({
+                dlg,
+                toolName: 'fs_read_picture',
+                mimeType,
+                bytes,
+            });
+            return ok(formatPictureResultYaml({
+                status: 'ok',
+                action: 'fs_read_picture',
+                path: displayPath,
+                mimeType,
+                byteLength: bytes.length,
+                artifactRelPath: item.artifact.relPath,
+            }), [item]);
+        }
+        catch (error) {
+            return fail(error instanceof Error ? error.message : String(error));
+        }
+    },
+};
 exports.writePictureTool = {
     type: 'func',
     name: 'write_picture',

package/dist/tools/prompts/codex_inspect_and_patch_tools/en/tools.md

@@ -12,6 +12,11 @@ Typical uses:
 - read-only `git status` / `git diff` / `git log` / `git show`
 - version probes and simple filesystem inspection
 
+Windows notes:
+
+- Prefer no-space forward-slash paths such as `D:/path/to/file`
+- Avoid nested `cmd /c "..."`
+
 Example:
 
 ```typescript

package/dist/tools/prompts/codex_inspect_and_patch_tools/zh/tools.md

@@ -12,6 +12,11 @@
 - 只读 `git status` / `git diff` / `git log` / `git show`
 - 版本探针与简单文件系统检查
 
+Windows 注意：
+
+- 优先使用不带空格的正斜杠路径，如 `D:/path/to/file`
+- 避免嵌套 `cmd /c "..."`
+
 示例：
 
 ```typescript

package/dist/tools/prompts/fs_read/en/errors.md

@@ -0,0 +1,6 @@
+# Errors
+
+- `PATH_REQUIRED`
+- `NOT_SYMLINK`
+- `NOT_FOUND`
+- `FAILED`

package/dist/tools/prompts/fs_read/en/index.md

@@ -0,0 +1,17 @@
+fs_read is Dominds' local-filesystem read-only toolset for reading and searching files outside rtws:
+
+- Directory listing
+- File reading
+- Symlink inspection
+- Content searching
+
+## Status
+
+- Status: Implemented
+- Main implementation files:
+  - Tool implementation: `dominds/main/tools/fs.ts`, `dominds/main/tools/txt.ts`, `dominds/main/tools/picture.ts`, `dominds/main/tools/ripgrep.ts`
+  - Toolset metadata: `dominds/main/tools/builtins.ts`, `dominds/main/tools/registry.ts`
+
+## Difference from ws_read
+
+`fs_read` exposes the same read-oriented capabilities as `ws_read`, but without the rtws path restriction.

package/dist/tools/prompts/fs_read/en/principles.md

@@ -0,0 +1,5 @@
+# Principles
+
+1. This toolset reads the local filesystem directly.
+2. It does not require paths to stay inside rtws.
+3. It remains read-only.

package/dist/tools/prompts/fs_read/en/scenarios.md

@@ -0,0 +1,3 @@
+# Scenarios
+
+Use `fs_read` when you need to inspect files outside the current rtws, such as a sibling checkout or a system path.

package/dist/tools/prompts/fs_read/en/tools.md

@@ -0,0 +1,11 @@
+# Tools
+
+- `fs_list_dir`
+- `fs_read_symlink`
+- `fs_read_file`
+- `fs_read_picture`
+- `fs_ripgrep_files`
+- `fs_ripgrep_snippets`
+- `fs_ripgrep_count`
+- `fs_ripgrep_fixed`
+- `fs_ripgrep_search`

package/dist/tools/prompts/fs_read/zh/errors.md

@@ -0,0 +1,6 @@
+# 错误
+
+- `PATH_REQUIRED`
+- `NOT_SYMLINK`
+- `NOT_FOUND`
+- `FAILED`

package/dist/tools/prompts/fs_read/zh/index.md

@@ -0,0 +1,17 @@
+fs_read 是 Dominds 的本机文件系统只读工具集，用于读取和搜索 rtws 之外的文件：
+
+- 目录查看
+- 文件读取
+- 符号链接检查
+- 内容搜索
+
+## 状态
+
+- 状态：已实现
+- 主要实现文件：
+  - 工具实现：`dominds/main/tools/fs.ts`、`dominds/main/tools/txt.ts`、`dominds/main/tools/picture.ts`、`dominds/main/tools/ripgrep.ts`
+  - toolset 元信息：`dominds/main/tools/builtins.ts`、`dominds/main/tools/registry.ts`
+
+## 与 ws_read 的区别
+
+`fs_read` 提供与 `ws_read` 相同的只读能力，但不要求路径必须位于 rtws 内。

package/dist/tools/prompts/fs_read/zh/principles.md

@@ -0,0 +1,5 @@
+# 原则
+
+1. 该工具集直接读取本机文件系统。
+2. 路径不必限制在 rtws 内。
+3. 仍然只读。

package/dist/tools/prompts/fs_read/zh/scenarios.md

@@ -0,0 +1,3 @@
+# 场景
+
+当你需要查看当前 rtws 之外的文件时，使用 `fs_read`，例如旁边的 checkout 或系统路径。

package/dist/tools/prompts/fs_read/zh/tools.md

@@ -0,0 +1,11 @@
+# 工具
+
+- `fs_list_dir`
+- `fs_read_symlink`
+- `fs_read_file`
+- `fs_read_picture`
+- `fs_ripgrep_files`
+- `fs_ripgrep_snippets`
+- `fs_ripgrep_count`
+- `fs_ripgrep_fixed`
+- `fs_ripgrep_search`

package/dist/tools/prompts/os/en/index.md

@@ -51,5 +51,5 @@ os is Dominds' **shell and process toolset** for executing system commands and m
 ⚠️ Shell command execution requires caution:
 
 - Avoid destructive commands (e.g., `rm -rf`)
-- Use absolute paths to avoid path injection
+- Use explicit paths to avoid path injection; on Windows, prefer forward-slash paths
 - Verify command output before executing follow-up operations

package/dist/tools/prompts/os/en/principles.md

@@ -71,7 +71,7 @@ Environment variables are system variables that affect process behavior.
 ### 1. Shell Command Security
 
 - **Validate input**: Use parameterized commands to avoid injection
-- **Use absolute paths**: Avoid relative path ambiguity
+- **Use explicit paths**: Avoid relative path ambiguity; on Windows, prefer forward-slash paths
 - **Check permissions**: Ensure sufficient permissions to execute commands
 
 ### 2. Process Management

package/dist/tools/prompts/os/en/scenarios.md

@@ -179,3 +179,24 @@ shell_cmd({
   command: 'free -m',
 });
 ```
+
+## Scenario 8: Windows Paths and PowerShell
+
+### Scenario Description
+
+Check files or run PowerShell commands on Windows.
+
+### Example
+
+```typescript
+// Default cmd.exe path: prefer forward slashes for no-space paths to avoid backslash and quote ambiguity
+shell_cmd({
+  command: 'if exist D:/AiWorks/chatgpt-workstation/dist/app.exe echo exists',
+});
+
+// Complex PowerShell command: choose PowerShell explicitly; Dominds encodes the command automatically
+shell_cmd({
+  command: 'Test-Path D:/AiWorks/chatgpt-workstation/dist/app.exe',
+  shell: 'powershell.exe',
+});
+```

package/dist/tools/prompts/os/en/tools.md

@@ -30,6 +30,12 @@ Execute Shell command.
 - `scrollbackLines` (optional): Number of recent output lines to retain in scrollback
 - `timeoutSeconds` (optional): Timeout in seconds before switching to daemon tracking
 
+**Windows notes:**
+
+- With the default `cmd.exe` path, prefer no-space forward-slash paths such as `D:/path/to/file`
+- For complex PowerShell commands, pass `shell: 'powershell.exe'` or `shell: 'pwsh'`; the command is encoded automatically to avoid quote and backslash ambiguity
+- Do not rely on nested `cmd /c "..."`
+
 **Returns:**
 
 ```yaml

package/dist/tools/prompts/os/zh/index.md

@@ -51,5 +51,5 @@ os 是 Dominds 的**命令行与进程工具集**，用于执行系统命令和
 ⚠️ Shell 命令执行需要谨慎操作：
 
 - 避免执行破坏性命令（如 `rm -rf`）
-- 使用绝对路径避免路径注入
+- 使用明确路径避免路径注入；Windows 下优先用正斜杠路径
 - 验证命令输出后再执行后续操作

package/dist/tools/prompts/os/zh/principles.md

@@ -71,7 +71,7 @@ Shell 命令执行允许智能体运行系统命令来完成各种任务。
 ### 1. Shell 命令安全
 
 - **验证输入**：使用参数化命令避免注入
-- **使用绝对路径**：避免相对路径歧义
+- **使用明确路径**：避免相对路径歧义；Windows 下优先用正斜杠路径
 - **检查权限**：确保有足够权限执行命令
 
 ### 2. 进程管理

package/dist/tools/prompts/os/zh/scenarios.md

@@ -179,3 +179,24 @@ shell_cmd({
   command: 'free -m',
 });
 ```
+
+## 场景 8：Windows 路径与 PowerShell
+
+### 场景描述
+
+在 Windows 上检查文件或运行 PowerShell 命令。
+
+### 示例
+
+```typescript
+// cmd.exe 默认路径：路径无空格时优先用正斜杠，避免反斜杠和引号歧义
+shell_cmd({
+  command: 'if exist D:/AiWorks/chatgpt-workstation/dist/app.exe echo exists',
+});
+
+// 复杂 PowerShell 命令：显式选择 PowerShell，系统会自动编码传递命令
+shell_cmd({
+  command: 'Test-Path D:/AiWorks/chatgpt-workstation/dist/app.exe',
+  shell: 'powershell.exe',
+});
+```

package/dist/tools/prompts/os/zh/tools.md

@@ -30,6 +30,12 @@
 - `scrollbackLines`（可选）：滚动回看里保留的最近输出行数
 - `timeoutSeconds`（可选）：超时秒数；超时后转为守护进程追踪
 
+**Windows 提示：**
+
+- 默认 `cmd.exe` 路径下，优先使用不带空格的正斜杠路径，如 `D:/path/to/file`
+- 复杂 PowerShell 命令建议显式传 `shell: 'powershell.exe'` 或 `shell: 'pwsh'`；系统会自动用编码方式传递命令，避免引号和反斜杠歧义
+- 不要依赖 `cmd /c "..."`
+
 **返回：**
 
 ```yaml

package/dist/tools/registry.d.ts

@@ -17,6 +17,12 @@ export type ToolsetMeta = {
      * system according to dialog scope rather than granted by team config.
      */
     assignable?: boolean;
+    /**
+     * Whether wildcard toolset expansion (`toolsets: ['*']`) may include this
+     * toolset. Defaults to true. Use false for explicitly grantable toolsets that
+     * should not be mass-assigned by wildcard baselines.
+     */
+    wildcardAssignable?: boolean;
     descriptionI18n?: I18nText;
     /**
      * Toolset-level prompt injected into the agent system prompt when the member

package/dist/tools/ripgrep.d.ts

@@ -1,6 +1,11 @@
 import type { FuncTool } from '../tool';
 export declare const ripgrepFilesTool: FuncTool;
+export declare const fsRipgrepFilesTool: FuncTool;
 export declare const ripgrepCountTool: FuncTool;
+export declare const fsRipgrepCountTool: FuncTool;
 export declare const ripgrepSnippetsTool: FuncTool;
+export declare const fsRipgrepSnippetsTool: FuncTool;
 export declare const ripgrepFixedTool: FuncTool;
+export declare const fsRipgrepFixedTool: FuncTool;
 export declare const ripgrepSearchTool: FuncTool;
+export declare const fsRipgrepSearchTool: FuncTool;