terry-core 0.1.2 → 0.1.5

package/dist/orchestrator.js

@@ -1,12 +1,108 @@
+const KNOWN_COMMANDS = ["git", "npm", "pnpm", "yarn", "node", "npx"];
 const TOOL_HINTS = [
-    { tool: "writeFile", match: /\b(write|create|update|edit|save)\b.*\b(file|doc|readme|json|ts|js)\b/i },
-    { tool: "readFile", match: /\b(read|open|show)\b.*\b(file|md|json|ts|js|readme)\b/i },
+    { tool: "runCommand", match: /\b(run|execute)\b|\b(git|npm|pnpm|yarn|node|npx)\b/i },
+    { tool: "writeFile", match: /\b(write|create|update|edit|save)\b.*\b(file|readme|json|md|ts|js)\b/i },
+    { tool: "readFile", match: /\b(read|open|show)\b.*\b(file|readme|json|md|ts|js)\b/i },
     { tool: "searchInFiles", match: /\b(search|find|grep|look for)\b/i },
     { tool: "gitStatus", match: /\bgit status|repo status|what changed\b/i },
     { tool: "gitDiff", match: /\bgit diff|show diff|changes\b/i },
-    { tool: "runCommand", match: /\b(run|execute|command|npm|pnpm|yarn|test|build)\b/i },
     { tool: "listDirectory", match: /\b(list|ls|folders?|directories?)\b/i }
 ];
+function stripWrappers(value) {
+    return value.trim().replace(/^["'`]|["'`]$/g, "");
+}
+function tokenizeCommand(raw) {
+    const tokens = [];
+    let current = "";
+    let quote = "";
+    for (let i = 0; i < raw.length; i += 1) {
+        const ch = raw[i];
+        if (!ch)
+            continue;
+        if (quote) {
+            if (ch === quote) {
+                quote = "";
+            }
+            else {
+                current += ch;
+            }
+            continue;
+        }
+        if (ch === '"' || ch === "'") {
+            quote = ch;
+            continue;
+        }
+        if (/\s/.test(ch)) {
+            if (current) {
+                tokens.push(current);
+                current = "";
+            }
+            continue;
+        }
+        current += ch;
+    }
+    if (current)
+        tokens.push(current);
+    return tokens;
+}
+function extractFirstPath(content) {
+    const quoted = content.match(/["'`]([^"'`]+)["'`]/);
+    if (quoted?.[1])
+        return quoted[1].trim();
+    const direct = content.match(/\b([./\\]?[a-zA-Z0-9_\-/\\.]+\.[a-zA-Z0-9_]+)\b/);
+    if (direct?.[1])
+        return direct[1].trim();
+    return null;
+}
+function parseRunCommand(content) {
+    const backtick = content.match(/`([^`]+)`/);
+    const candidate = backtick?.[1] ??
+        content.match(/\b(?:run|execute)(?:\s+the)?(?:\s+command)?\s+(.+)$/i)?.[1] ??
+        content.match(new RegExp(`^\\s*(${KNOWN_COMMANDS.join("|")})\\b(.+)?$`, "i"))?.[0] ??
+        "";
+    const normalized = candidate.trim().replace(/[.;,\s]+$/g, "");
+    if (!normalized)
+        return null;
+    const tokens = tokenizeCommand(normalized);
+    if (tokens.length === 0)
+        return null;
+    const [cmd, ...args] = tokens;
+    if (!cmd || !KNOWN_COMMANDS.includes(cmd.toLowerCase())) {
+        return null;
+    }
+    return { cmd, args };
+}
+function parseReadFileArgs(content) {
+    const pathMatch = content.match(/\b(?:read|open|show)(?:\s+the)?(?:\s+file)?\s+["'`]([^"'`]+)["'`]/i)?.[1] ??
+        extractFirstPath(content);
+    return { pathRelativeToWorkspace: pathMatch ?? "README.md" };
+}
+function parseWriteFileArgs(content) {
+    const pathMatch = content.match(/\b(?:write|create|update|edit|save)(?:\s+(?:to|into))?(?:\s+file)?\s+["'`]([^"'`]+)["'`]/i)?.[1] ??
+        content.match(/\b(?:write|create|update|edit|save)(?:\s+(?:to|into))?(?:\s+file)?\s+([^\s]+)\b/i)?.[1] ??
+        extractFirstPath(content) ??
+        "README.md";
+    const contentMatch = content.match(/\b(?:with content|with text|saying|that says)\s+([\s\S]+)$/i)?.[1] ??
+        content.match(/:\s*([\s\S]+)$/)?.[1] ??
+        `# Terry update\n\nGenerated from task:\n${content}\n`;
+    return {
+        pathRelativeToWorkspace: stripWrappers(pathMatch),
+        content: contentMatch.trim()
+    };
+}
+function parseSearchArgs(content) {
+    const quoted = content.match(/["'`]([^"'`]+)["'`]/)?.[1];
+    const phrase = quoted ??
+        content.match(/\b(?:search|find|grep|look for)\b\s+([\s\S]+)$/i)?.[1] ??
+        content;
+    return { query: phrase.replace(/^for\s+/i, "").trim() };
+}
+function parseListDirectoryArgs(content) {
+    const target = content.match(/\b(?:in|inside|under)\s+["'`]([^"'`]+)["'`]/i)?.[1] ??
+        content.match(/\b(?:in|inside|under)\s+([^\s]+)\b/i)?.[1] ??
+        ".";
+    return { pathRelativeToWorkspace: stripWrappers(target) || "." };
+}
 function inferTool(content) {
     for (const hint of TOOL_HINTS) {
         if (hint.match.test(content))
@@ -15,27 +111,22 @@ function inferTool(content) {
     return null;
 }
 function inferArgs(tool, content) {
-    if (tool === "searchInFiles") {
-        const phrase = content.split("search").pop()?.trim() || content;
-        return { query: phrase.replace(/^for\s+/i, "") };
-    }
-    if (tool === "runCommand") {
-        return { cmd: "echo", args: [content] };
-    }
+    if (tool === "searchInFiles")
+        return parseSearchArgs(content);
+    if (tool === "runCommand")
+        return parseRunCommand(content);
     if (tool === "listDirectory")
-        return { pathRelativeToWorkspace: "." };
+        return parseListDirectoryArgs(content);
     if (tool === "gitStatus")
         return {};
-    if (tool === "gitDiff")
-        return {};
-    if (tool === "readFile")
-        return { pathRelativeToWorkspace: "README.md" };
-    if (tool === "writeFile") {
-        return {
-            pathRelativeToWorkspace: "README.md",
-            content: `# Terry update\n\nGenerated from task:\n${content}\n`
-        };
+    if (tool === "gitDiff") {
+        const target = extractFirstPath(content);
+        return target ? { path: target } : {};
     }
+    if (tool === "readFile")
+        return parseReadFileArgs(content);
+    if (tool === "writeFile")
+        return parseWriteFileArgs(content);
     return {};
 }
 export const rulesOrchestrator = (messages) => {
@@ -49,10 +140,17 @@ export const rulesOrchestrator = (messages) => {
             summary: "I can help with workspace files, search, git, and command planning. Ask a concrete repo or file operation."
         };
     }
+    const args = inferArgs(tool, lastUser.content);
+    if (tool === "runCommand" && !args) {
+        return {
+            kind: "summarize",
+            summary: "I can run approved workspace commands. Please provide an explicit command, for example: run `npm test`."
+        };
+    }
     return {
         kind: "ask_permission",
         tool,
-        args: inferArgs(tool, lastUser.content),
+        args,
         reason: `Detected request likely needs tool: ${tool}.`
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terry-core",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "description": "Core policy, tooling, and orchestration modules for Terry Agent.",
   "license": "MIT",
   "author": "ELEVAREL",