@zhongqian97-code/ecode 0.5.9 → 0.5.11

package/dist/index.js

@@ -3,8 +3,8 @@ const _ew=process.emitWarning.bind(process);process.emitWarning=function(w,...a)
 
 // src/index.ts
 import { createRequire } from "module";
-import { resolve as resolve6, dirname as dirname8 } from "path";
-import { fileURLToPath } from "url";
+import { resolve as resolve5, dirname as dirname9 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
 import React4 from "react";
 import { render } from "ink";
 import { readFileSync as readFileSync5 } from "fs";
@@ -540,13 +540,13 @@ function classifyCommand(cmd, dangerPatterns, _depth = 0) {
 import { exec } from "child_process";
 var DEFAULT_TIMEOUT_MS = 3e4;
 function executeBash(cmd, timeoutMs = DEFAULT_TIMEOUT_MS) {
-  return new Promise((resolve7) => {
+  return new Promise((resolve6) => {
     exec(cmd, { timeout: timeoutMs }, (err, stdout, stderr) => {
       if (err) {
         const exitCode = err.code ?? 1;
-        resolve7({ stdout: stdout ?? "", stderr: stderr ?? "", exitCode });
+        resolve6({ stdout: stdout ?? "", stderr: stderr ?? "", exitCode });
       } else {
-        resolve7({ stdout: stdout ?? "", stderr: stderr ?? "", exitCode: 0 });
+        resolve6({ stdout: stdout ?? "", stderr: stderr ?? "", exitCode: 0 });
       }
     });
   });
@@ -2170,7 +2170,7 @@ function parseMouseScroll(data) {
 
 // src/ui/App.tsx
 import { homedir as homedir3 } from "os";
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 
 // src/automation/store.ts
 import { readFile as readFile8, writeFile as writeFile5, mkdir as mkdir2 } from "fs/promises";
@@ -2268,11 +2268,17 @@ async function executeJob(job, config2) {
 
 // src/automation/goal/evaluator.ts
 function parseVerdict(response) {
-  const lower = response.toLowerCase();
-  if (lower.includes("not_done")) return "not_done";
-  if (lower.includes("blocked")) return "blocked";
-  if (lower.includes("done")) return "done";
-  return "not_done";
+  const scan = (text) => {
+    if (/\bnot_done\b/.test(text)) return "not_done";
+    if (/\bblocked\b/.test(text) && !/\bnot\s+blocked\b/.test(text)) return "blocked";
+    if (/\bdone\b/.test(text) && !/\bnot\s+done\b/.test(text)) return "done";
+    return null;
+  };
+  const firstLine = (response.split("\n")[0] ?? "").trim().toLowerCase();
+  const fromFirstLine = scan(firstLine);
+  if (fromFirstLine !== null) return fromFirstLine;
+  const fromFull = scan(response.toLowerCase());
+  return fromFull ?? "not_done";
 }
 function buildPrompt(input) {
   return [
@@ -2487,12 +2493,38 @@ async function cmdLoop(args, deps) {
   const spaceIdx = trimmed.indexOf(" ");
   if (spaceIdx !== -1) {
     const firstToken = trimmed.slice(0, spaceIdx);
-    const parsed = parseInterval(firstToken);
+    const rest = trimmed.slice(spaceIdx + 1);
+    const parsed1 = parseInterval(firstToken);
+    if (parsed1 !== null) {
+      intervalMs = parsed1.intervalMs;
+      prompt = rest.trim();
+    } else {
+      const secondSpaceIdx = rest.indexOf(" ");
+      if (secondSpaceIdx !== -1) {
+        const twoToken = `${firstToken} ${rest.slice(0, secondSpaceIdx)}`;
+        const parsed2 = parseInterval(twoToken);
+        if (parsed2 !== null) {
+          intervalMs = parsed2.intervalMs;
+          prompt = rest.slice(secondSpaceIdx + 1).trim();
+        }
+      } else {
+        const parsed2 = parseInterval(`${firstToken} ${rest}`);
+        if (parsed2 !== null) {
+          intervalMs = parsed2.intervalMs;
+          prompt = "";
+        }
+      }
+    }
+  } else {
+    const parsed = parseInterval(trimmed);
     if (parsed !== null) {
       intervalMs = parsed.intervalMs;
-      prompt = trimmed.slice(spaceIdx + 1).trim();
+      prompt = "";
     }
   }
+  if (!prompt.trim()) {
+    return "\u7528\u6CD5\uFF1A/loop [interval] <prompt>\uFF0C\u4F8B\u5982\uFF1A/loop 10m \u68C0\u67E5 deploy \u72B6\u6001";
+  }
   const now = /* @__PURE__ */ new Date();
   const job = {
     id: randomUUID2(),
@@ -2542,6 +2574,9 @@ async function cmdUnloop(idOrPrefix, deps) {
 import { randomUUID as randomUUID3 } from "crypto";
 async function cmdGoal(args, deps) {
   const condition = args.trim();
+  if (!condition) {
+    return "\u7528\u6CD5\uFF1A/goal <\u76EE\u6807\u6761\u4EF6>\uFF0C\u4F8B\u5982\uFF1A/goal \u6240\u6709\u6D4B\u8BD5\u901A\u8FC7";
+  }
   const now = /* @__PURE__ */ new Date();
   const job = {
     id: randomUUID3(),
@@ -2784,11 +2819,11 @@ var AutomationManager = class {
         job.id,
         `[goal ${job.id.slice(0, 8)}] \u7B2C ${job.activeTurnCount} \u8F6E\uFF1A\u5C1A\u672A\u5B8C\u6210\uFF0C\u7EE7\u7EED\u6267\u884C\u2026`
       );
-      await new Promise((resolve7) => {
-        const timer = setTimeout(resolve7, 5e3);
+      await new Promise((resolve6) => {
+        const timer = setTimeout(resolve6, 5e3);
         signal.addEventListener("abort", () => {
           clearTimeout(timer);
-          resolve7();
+          resolve6();
         }, { once: true });
       });
     }
@@ -2877,6 +2912,7 @@ function generateTitle(firstUserMessage) {
 // src/meta_skill/index.ts
 import * as fs11 from "fs";
 import * as path9 from "path";
+import { fileURLToPath } from "url";
 
 // src/meta_skill/task-classifier.ts
 var RULES = {
@@ -3591,18 +3627,44 @@ import * as os from "os";
 var STORE_PATH = path8.resolve(os.homedir(), ".ecode", "learning-records.jsonl");
 
 // src/meta_skill/index.ts
+function resolveBuiltinSkillsDir() {
+  try {
+    let dir = path9.dirname(fileURLToPath(import.meta.url));
+    for (let i = 0; i < 4; i++) {
+      const candidate = path9.join(dir, "skills");
+      if (fs11.existsSync(candidate) && fs11.statSync(candidate).isDirectory()) {
+        const hasSkillContent = fs11.readdirSync(candidate).some(
+          (entry) => fs11.existsSync(path9.join(candidate, entry, "SKILL.md"))
+        );
+        if (hasSkillContent) return candidate;
+      }
+      const parent = path9.dirname(dir);
+      if (parent === dir) break;
+      dir = parent;
+    }
+  } catch {
+  }
+  return null;
+}
 function runMetaAlign(input) {
   const taskType = input.task.type && isValidTaskType(input.task.type) ? input.task.type : classifyTask(input.task.goal);
   const inheritedSkills = getBaselineSkills(taskType);
+  const builtinSkillsDir2 = resolveBuiltinSkillsDir();
   const allSteps = [];
   for (const skillName of inheritedSkills) {
-    const primaryPath = path9.resolve(process.cwd(), "skills", skillName, "SKILL.md");
-    const fallbackPath = path9.resolve(process.cwd(), "skills", skillName + ".md");
+    const candidates = [];
+    if (builtinSkillsDir2) {
+      candidates.push(path9.join(builtinSkillsDir2, skillName, "SKILL.md"));
+      candidates.push(path9.join(builtinSkillsDir2, skillName + ".md"));
+    }
+    candidates.push(path9.join(process.cwd(), "skills", skillName, "SKILL.md"));
+    candidates.push(path9.join(process.cwd(), "skills", skillName + ".md"));
     let body = "";
-    if (fs11.existsSync(primaryPath)) {
-      body = fs11.readFileSync(primaryPath, { encoding: "utf-8" });
-    } else if (fs11.existsSync(fallbackPath)) {
-      body = fs11.readFileSync(fallbackPath, { encoding: "utf-8" });
+    for (const p of candidates) {
+      if (fs11.existsSync(p)) {
+        body = fs11.readFileSync(p, { encoding: "utf-8" });
+        break;
+      }
     }
     const steps = extractWorkflowSteps(body);
     allSteps.push(...steps);
@@ -3790,7 +3852,7 @@ function App({ config: config2, version: version2, autoMode: autoMode2 = false,
   const pendingConfirmRef = useRef2(null);
   const abortControllerRef = useRef2(null);
   const llmRef = useRef2(llmClient ?? createProvider(resolveActiveProfile(config2)));
-  const automationDataDir = config2.logDir ? join10(config2.logDir, "automation") : join10(homedir3(), ".config", "ecode", "automation");
+  const automationDataDir = config2.logDir ? join11(config2.logDir, "automation") : join11(homedir3(), ".config", "ecode", "automation");
   const automationManagerRef = useRef2(
     new AutomationManager({
       dataDir: automationDataDir,
@@ -3996,10 +4058,10 @@ function App({ config: config2, version: version2, autoMode: autoMode2 = false,
     }
   });
   const confirm = useCallback((prompt) => {
-    return new Promise((resolve7) => {
+    return new Promise((resolve6) => {
       setStatus("awaiting_confirm");
       setConfirmPrompt(prompt);
-      pendingConfirmRef.current = { resolve: resolve7 };
+      pendingConfirmRef.current = { resolve: resolve6 };
     });
   }, []);
   const runLlmLoop = useCallback(
@@ -4522,13 +4584,13 @@ async function runPipe(prompt, llm, out = process.stdout, systemPrompt) {
   }
 }
 function readStdin() {
-  return new Promise((resolve7, reject) => {
+  return new Promise((resolve6, reject) => {
     let data = "";
     process.stdin.setEncoding("utf-8");
     process.stdin.on("data", (chunk) => {
       data += chunk;
     });
-    process.stdin.on("end", () => resolve7(data.trim()));
+    process.stdin.on("end", () => resolve6(data.trim()));
     process.stdin.on("error", reject);
   });
 }
@@ -4697,10 +4759,10 @@ if (replayFile) {
     process.exit(1);
   }
 }
-var __dirname = dirname8(fileURLToPath(import.meta.url));
-var builtinSkillsDir = resolve6(__dirname, "../skills");
-var userSkillsDir = resolve6(process.env.HOME ?? "~", ".ecode/skills");
-var projectSkillsDir = resolve6(process.cwd(), ".ecode/skills");
+var __dirname = dirname9(fileURLToPath2(import.meta.url));
+var builtinSkillsDir = resolve5(__dirname, "../skills");
+var userSkillsDir = resolve5(process.env.HOME ?? "~", ".ecode/skills");
+var projectSkillsDir = resolve5(process.cwd(), ".ecode/skills");
 var registry = new SkillRegistry();
 for (const dir of [builtinSkillsDir, userSkillsDir, projectSkillsDir]) {
   const skills = await loadSkillsFromDir(dir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhongqian97-code/ecode",
-  "version": "0.5.9",
+  "version": "0.5.11",
   "description": "A minimal Claude Code clone with REPL interface and bash tool calling",
   "type": "module",
   "author": "zhongqian97-code",