@sns-myagent/cli 0.2.0 → 0.3.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@sns-myagent/cli",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "SNS-MyAgent — Pi Agent size, full features. BYOK coding agent CLI.",
   "homepage": "https://github.com/Reihantt6/sns-myagent",
   "author": "Reihantt6",
@@ -33,7 +33,7 @@
   "scripts": {
     "fetch-binary": "node scripts/fetch-binary.mjs",
     "postinstall": "node scripts/fetch-binary.mjs && node scripts/apply-pi-natives-patch.js",
-    "build": "bun build --compile --define process.env.PI_COMPILED='\"true\"' --define process.env.PKG_VERSION='\"0.1.0\"' --no-compile-autoload-bunfig --no-compile-autoload-dotenv --no-compile-autoload-tsconfig --no-compile-autoload-package-json --keep-names --outfile bin/snscoder-linux-x64 ./src/cli/entry.ts && cp bin/snscoder-linux-x64 bin/snscoder",
+    "build": "bun build --compile --define process.env.PI_COMPILED='\"true\"' --define process.env.PKG_VERSION='\"0.3.0\"' --no-compile-autoload-bunfig --no-compile-autoload-dotenv --no-compile-autoload-tsconfig --no-compile-autoload-package-json --keep-names --outfile bin/snscoder-linux-x64 ./src/cli/entry.ts && cp bin/snscoder-linux-x64 bin/snscoder",
     "check": "biome check . && bun run check:types",
     "check:types": "tsgo -p tsconfig.json --noEmit",
     "lint": "biome lint .",
@@ -42,7 +42,7 @@
     "fmt": "biome format --write . && bun run format-prompts",
     "format-prompts": "bun scripts/format-prompts.ts",
     "generate-docs-index": "bun scripts/generate-docs-index.ts --generate",
-    "prepack": "bun scripts/generate-docs-index.ts --generate && (bun --cwd=../collab-web run build:tool-views 2>/dev/null || echo 'collab-web not found, skipping') && bun scripts/bundle-dist.ts || ( bun scripts/generate-docs-index.ts --reset; exit 1 )",
+    "prepack": "(bun scripts/generate-docs-index.ts --generate 2>/dev/null || echo 'docs index skipped') && (bun --cwd=../collab-web run build:tool-views 2>/dev/null || echo 'collab-web not found, skipping') && (bun scripts/bundle-dist.ts 2>/dev/null || echo 'bundle-dist skipped')",
     "postpack": "bun scripts/generate-docs-index.ts --reset",
     "bench:guard": "bun scripts/bench-guard.ts"
   },
@@ -106,6 +106,7 @@
   },
   "files": [
     "src",
+    "bin",
     "dist/cli.js",
     "dist/*.node",
     "scripts",

package/scripts/apply-pi-natives-patch.js

@@ -6,6 +6,13 @@
  * .node addon is unavailable in a compiled Bun binary (no embed:native step).
  * This lets the binary start in "JS-only mode" instead of crashing.
  *
+ * The patch REPLACES the trailing `throw new Error("Failed to load ...")` block
+ * with an `if (ctx.isCompiledBinary) return noopProxy; else throw;` block. The
+ * earlier version of this patch only APPENDED a fallback after the throw — but
+ * `throw` is unconditional and aborts the function, so the fallback was dead
+ * code. This rewrite uses string replacement to convert the throw into a
+ * conditional re-throw.
+ *
  * Re-run: node scripts/apply-pi-natives-patch.js
  */
 import { readFileSync, writeFileSync, existsSync } from "node:fs";
@@ -15,72 +22,91 @@ import { fileURLToPath } from "node:url";
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const root = join(__dirname, "..");
 
-const target = join(
-  root,
-  "node_modules",
-  "@oh-my-pi",
-  "pi-natives",
-  "native",
-  "loader-state.js",
-);
+const target = join(root, "node_modules", "@oh-my-pi", "pi-natives", "native", "loader-state.js");
 
 if (!existsSync(target)) {
-  console.warn("[patch] pi-natives not installed, skipping.");
-  process.exit(0);
+	console.warn("[patch] pi-natives not installed, skipping.");
+	process.exit(0);
 }
 
 const src = readFileSync(target, "utf8");
 
-// Already patched?
-if (src.includes("JS-only fallback")) {
-  console.log("[patch] loader-state.js already patched, skipping.");
-  process.exit(0);
+// Idempotent: already fully patched with the conditional version
+if (src.includes("JS-only mode: native addon unavailable")) {
+	console.log("[patch] loader-state.js already fully patched, skipping.");
+	process.exit(0);
 }
 
-const marker = "If you need support for this platform, please open an issue.";
-const idx = src.indexOf(marker);
-if (idx === -1) {
-  console.error("[patch] Could not locate injection point in loader-state.js");
-  process.exit(1);
+// Idempotent: old incomplete patch applied (has dead code after throw)
+// — restore by removing the dead append, then re-apply below.
+let working = src;
+const deadBlockMarker = "\t// --- JS-only fallback: return a no-op stub proxy so the binary can ---";
+const deadIdx = working.indexOf(deadBlockMarker);
+if (deadIdx !== -1) {
+	// Remove everything from the dead block marker to end of file or to next
+	// standalone `}\n\n}` (end of function). Conservative: remove marker + 60 lines.
+	const lines = working.split("\n");
+	const markerLine = lines.findIndex((l) => l.includes(deadBlockMarker));
+	// Find the trailing closing brace of the loadNative function (single `}\n` at col 0
+	// or `\n}` at start of line preceded by blank line)
+	let endLine = lines.length;
+	for (let i = markerLine + 1; i < lines.length; i++) {
+		if (lines[i] === "}") {
+			endLine = i + 1;
+			break;
+		}
+	}
+	lines.splice(markerLine, endLine - markerLine);
+	working = lines.join("\n");
+	console.log("[patch] Removed dead JS-only fallback block from prior incomplete patch.");
 }
 
-// Find the end of the "Unsupported platform" throw block (next closing brace + newline)
-const afterMarker = src.indexOf("\n\t);", idx) + 4; // after the );\n
-
-const patch = `
-\t// --- JS-only fallback: return a no-op stub proxy so the binary can ---
-\t// --- start up even when pi_natives .node files are unavailable.     ---
-\tif (ctx.isCompiledBinary) {
-\t\tconst details = errors.map(error => \`- \${error}\`).join("\\n");
-\t\tstartupMarker(\`native:loadNative:jsOnlyFallback:\${details}\`);
-\t\ttry {
-\t\t\tfs.writeSync(2, \`[pi-natives] JS-only mode: native addon unavailable for \${ctx.addonLabel}\\n\`);
-\t\t\tfs.writeSync(2, \`[pi-natives] Tried:\\n\${details}\\n\`);
-\t\t\tfs.writeSync(2, \`[pi-natives] Native features (grep, pty, shell, clipboard, syntax highlighting, etc.) are disabled.\\n\`);
-\t\t} catch {
-\t\t\t// stderr unavailable
-\t\t}
+// Locate the trailing throw new Error("Failed to load pi_natives...") block.
+const throwStart = 'throw new Error(\n\t\t`Failed to load pi_natives native addon';
+const throwIdx = working.indexOf(throwStart);
+if (throwIdx === -1) {
+	console.error("[patch] Could not locate `throw new Error` block to replace.");
+	process.exit(1);
+}
+const throwEnd = working.indexOf("\n\t);", throwIdx) + 4;
+const oldThrowBlock = working.substring(throwIdx, throwEnd);
 
-\t\tconst noop = new Proxy(function () {}, {
-\t\t\tget(_target, prop) {
-\t\t\t\tif (prop === Symbol.toPrimitive) return () => "";
-\t\t\t\tif (prop === Symbol.toStringTag) return "NativeStub";
-\t\t\t\tif (prop === "then") return undefined;
-\t\t\t\tif (prop === Symbol.iterator) return function* () {};
-\t\t\t\tif (prop === "length") return 0;
-\t\t\t\treturn noop;
-\t\t\t},
-\t\t\tapply(_target, _thisArg, args) {
-\t\t\t\treturn noop;
-\t\t\t},
-\t\t\tconstruct(_target, _args) {
-\t\t\t\treturn noop;
-\t\t\t},
-\t\t});
-\t\treturn noop;
-\t}
-`;
+// New conditional block: when compiled binary, return noop Proxy stub;
+// otherwise re-throw the original error.
+const replacement = [
+	"\t// --- JS-only fallback (patched by scripts/apply-pi-natives-patch.js): ---",
+	"\t// --- when compiled binary can't load native .node, return a no-op    ---",
+	"\t// --- Proxy stub so the binary still starts. Plain Node mode keeps    ---",
+	"\t// --- the original throw so missing-native is a hard failure there.   ---",
+	"\tif (ctx.isCompiledBinary) {",
+	"\t\tconst fallbackDetails = errors.map(error => `- ${error}`).join(\"\\n\");",
+	"\t\tstartupMarker(`native:loadNative:jsOnlyFallback:${fallbackDetails}`);",
+	"\t\ttry {",
+	"\t\t\tfs.writeSync(2, `[pi-natives] JS-only mode: native addon unavailable for ${ctx.addonLabel}\\n`);",
+	"\t\t\tfs.writeSync(2, `[pi-natives] Native features (grep, pty, shell, clipboard, syntax highlighting, etc.) are disabled.\\n`);",
+	"\t\t} catch {",
+	"\t\t\t// stderr unavailable",
+	"\t\t}",
+	"",
+	"\t\tconst noop = new Proxy(function () {}, {",
+	"\t\t\tget(_target, prop) {",
+	"\t\t\t\tif (prop === Symbol.toPrimitive) return () => \"\";",
+	"\t\t\t\tif (prop === Symbol.toStringTag) return \"NativeStub\";",
+	"\t\t\t\tif (prop === \"then\") return undefined;",
+	"\t\t\t\tif (prop === Symbol.iterator) return function* () {};",
+	"\t\t\t\tif (prop === \"length\") return 0;",
+	"\t\t\t\treturn noop;",
+	"\t\t\t},",
+	"\t\t\tapply(_target, _thisArg, _args) { return noop; },",
+	"\t\t\tconstruct(_target, _args) { return noop; },",
+	"\t\t});",
+	"\t\treturn noop;",
+	"\t}",
+	"\tthrow new Error(",
+	"\t\t`Failed to load pi_natives native addon for ${ctx.addonLabel}.\\n\\nTried:\\n${details}\\n\\n${buildHelpMessage(ctx)}`,",
+	"\t);",
+].join("\n");
 
-const patched = src.slice(0, afterMarker) + patch + src.slice(afterMarker);
+const patched = working.replace(oldThrowBlock, replacement);
 writeFileSync(target, patched, "utf8");
-console.log("[patch] Applied pi-natives JS-only fallback patch.");
+console.log("[patch] Applied pi-natives JS-only fallback patch (conditional version).");