@0xgeorgemathew/zcode 0.3.0 → 0.3.1

package/lib/commands/run.js

@@ -92,6 +92,8 @@ module.exports = async function run(parsed) {
       if (flags.includeReasoning) result.reasoning = turn.reasoningText;
       process.stdout.write(JSON.stringify(result) + '\n');
     } else {
+      if (!streamedText.trim()) process.stdout.write(turn.response);
+      process.stdout.write('\n');
       reporter.footer({
         model: turn.engineModel || flags.model,
         effort: turn.engineReasoningLevel || flags.effort,
@@ -99,8 +101,6 @@ module.exports = async function run(parsed) {
         durationMs: turn.durationMs,
         sessionId: turn.sessionId,
       });
-      if (!streamedText.trim()) process.stdout.write(turn.response);
-      process.stdout.write('\n');
     }
     client.kill();
     process.exit(0);

package/lib/engine.js

@@ -31,20 +31,50 @@ class BuiltinConfigNotFoundError extends Error {
   }
 }
 
+// Our own wrapper's real path. The engine resolver must never resolve to
+// itself: `npm install -g` puts a `zcode` symlink on PATH, and before the
+// 0.3.1 fix the PATH probe grabbed it as "the engine" (0.3.0 regression:
+// every command then exited 4 probing <prefix>/config/provider/…).
+const SELF_BIN_PATH = (() => {
+  try {
+    return fs.realpathSync(path.join(__dirname, '..', 'bin', 'zcode.js'));
+  } catch {
+    return null;
+  }
+})();
+
+function isSelf(candidate) {
+  if (!SELF_BIN_PATH) return false;
+  try {
+    return fs.realpathSync(candidate) === SELF_BIN_PATH;
+  } catch {
+    return false;
+  }
+}
+
 // Resolves a candidate that is either the zcode.cjs file itself or a
-// directory containing it. Returns an absolute file path or null.
-function resolveCandidate(candidate) {
+// directory containing it. strictFile (default true for everything except
+// an explicit ZAI_CODE_ENGINE): a bare file is only accepted when it is
+// literally named zcode.cjs — the engine bundle — so wrappers and launchers
+// named `zcode` never pass. Our own binary is always rejected.
+function resolveCandidate(candidate, { strictFile = true } = {}) {
+  if (isSelf(candidate)) return null;
   let st;
   try {
     st = fs.statSync(candidate);
   } catch {
     return null;
   }
-  if (st.isFile()) return path.resolve(candidate);
+  if (st.isFile()) {
+    if (strictFile && path.basename(candidate) !== 'zcode.cjs') return null;
+    return path.resolve(candidate);
+  }
   if (st.isDirectory()) {
     const inner = path.join(candidate, 'zcode.cjs');
     try {
-      if (fs.statSync(inner).isFile()) return path.resolve(inner);
+      if (fs.statSync(inner).isFile() && !isSelf(inner)) {
+        return path.resolve(inner);
+      }
     } catch {
       /* not there */
     }
@@ -66,20 +96,25 @@ function whichOnPath(bin, envPath) {
   return null;
 }
 
-// First hit wins (DESIGN §4). Throws EngineNotFoundError listing all probes.
+// First hit wins (DESIGN §4, revised 0.3.1): explicit env override, then
+// the app bundle (the canonical macOS location), then PATH/home probes —
+// which now only accept a real zcode.cjs, never a same-named wrapper.
+// Throws EngineNotFoundError listing all probes.
 function resolveEngine(env = process.env) {
   const probed = [];
   const candidates = [];
-  if (env.ZAI_CODE_ENGINE) candidates.push(env.ZAI_CODE_ENGINE);
+  if (env.ZAI_CODE_ENGINE) candidates.push({ path: env.ZAI_CODE_ENGINE, strictFile: false });
+  candidates.push({ path: APP_BUNDLE_ENGINE });
   const onPath = whichOnPath('zcode', env.PATH);
-  if (onPath) candidates.push(onPath);
-  candidates.push(path.join(os.homedir(), '.local', 'bin', 'zcode'));
-  candidates.push(path.join(os.homedir(), '.zcode', 'runtime', 'zcode.cjs'));
-  candidates.push(APP_BUNDLE_ENGINE);
+  if (onPath) candidates.push({ path: onPath });
+  candidates.push({ path: path.join(os.homedir(), '.local', 'bin', 'zcode') });
+  candidates.push({ path: path.join(os.homedir(), '.zcode', 'runtime', 'zcode.cjs') });
   for (const candidate of candidates) {
-    const resolved = resolveCandidate(candidate);
+    const resolved = resolveCandidate(candidate.path, {
+      strictFile: candidate.strictFile ?? true,
+    });
     if (resolved) return resolved;
-    probed.push(candidate);
+    probed.push(candidate.path);
   }
   throw new EngineNotFoundError(probed);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xgeorgemathew/zcode",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Headless GLM-5.3 / GLM-5.3-Flash coding CLI for agents: streaming thinking, subagents, MCP servers, skills, session continuity. Wraps the ZCode engine. Zero dependencies.",
   "license": "MIT",
   "private": false,