okstra 0.68.0 → 0.70.0

package/src/render-final-report.mjs

@@ -0,0 +1,22 @@
+import { runInstalledScript } from "./_python-helper.mjs";
+
+const USAGE = `okstra render-final-report — render the markdown sibling of a final-report data.json
+
+Wraps the python helper (\`okstra-render-final-report.py\`) installed under
+\`~/.okstra/bin/\` so skills call \`okstra render-final-report\` instead of
+emitting a \`python3 "$HOME/..."\` invocation (which breaks \`Bash(okstra:*)\`
+permission matching and prompts on every call).
+
+Usage:
+  okstra render-final-report <path-to-final-report.data.json>
+
+The argument is forwarded verbatim to the python helper.
+`;
+
+export async function run(args) {
+  return runInstalledScript({
+    scriptName: "okstra-render-final-report.py",
+    args,
+    usage: USAGE,
+  });
+}

package/src/render-views.mjs

@@ -1,18 +1,14 @@
-import { spawn } from "node:child_process";
-import { existsSync } from "node:fs";
-import { resolve as resolvePath } from "node:path";
-import { fileURLToPath } from "node:url";
-import { resolvePaths } from "./paths.mjs";
+import { runInstalledScript } from "./_python-helper.mjs";
 
-const USAGE = `okstra render-views — render slim AI + self-contained HTML views of a final-report
+const USAGE = `okstra render-views — render the self-contained HTML view of a final-report
 
 A thin spawn shim over \`scripts/okstra-render-report-views.py\` (installed
 at \`$HOME/.okstra/bin/okstra-render-report-views.py\`). Reads the final-
-report MD and writes two siblings:
+report MD and writes a single sibling:
 
-  <stem>.slim.md   — token-saving AI consumption copy
   <stem>.html       — single-file self-contained human view with form
-                       controls on §5 clarification rows
+                       controls on §5 clarification rows (skipped when the
+                       report has no §5 C-* clarification rows)
 
 Usage:
   okstra render-views <path-to-final-report.md>
@@ -23,45 +19,10 @@ When the optional flags are omitted the script infers from the report
 path and its '- Task Type:' / '- Task Key:' lines.
 `;
 
-function resolveEntrypoint(paths) {
-  // Prefer the installed copy under ~/.okstra/bin (what production users
-  // see); fall back to the in-repo dev source when running from a
-  // checkout that hasn't been installed.
-  const installed = resolvePath(paths.home, "bin", "okstra-render-report-views.py");
-  if (existsSync(installed)) return installed;
-  const here = fileURLToPath(new URL("..", import.meta.url));
-  const dev = resolvePath(here, "scripts", "okstra-render-report-views.py");
-  if (existsSync(dev)) return dev;
-  return null;
-}
-
 export async function run(args) {
-  if (args.includes("--help") || args.includes("-h")) {
-    process.stdout.write(USAGE);
-    return 0;
-  }
-  if (args.length === 0) {
-    process.stderr.write("error: missing <path-to-final-report.md>\n");
-    process.stderr.write(USAGE);
-    return 2;
-  }
-  const paths = await resolvePaths();
-  const entry = resolveEntrypoint(paths);
-  if (!entry) {
-    process.stderr.write(
-      "error: okstra-render-report-views.py not found. " +
-      "Run `okstra install` to install the runtime.\n",
-    );
-    return 1;
-  }
-  return await new Promise((res) => {
-    const child = spawn("python3", [entry, ...args], {
-      stdio: ["ignore", "inherit", "inherit"],
-    });
-    child.on("error", (err) => {
-      process.stderr.write(`error: ${err.message}\n`);
-      res(1);
-    });
-    child.on("close", (code) => res(code ?? 0));
+  return runInstalledScript({
+    scriptName: "okstra-render-report-views.py",
+    args,
+    usage: USAGE,
   });
 }

package/src/spawn-followups.mjs

@@ -0,0 +1,23 @@
+import { runInstalledScript } from "./_python-helper.mjs";
+
+const USAGE = `okstra spawn-followups — create follow-up task bundles from a final report
+
+Wraps the python helper (\`okstra-spawn-followups.py\`) installed under
+\`~/.okstra/bin/\` so skills call \`okstra spawn-followups\` instead of
+emitting a \`python3 "$HOME/..."\` invocation (which breaks \`Bash(okstra:*)\`
+permission matching and prompts on every call).
+
+Usage:
+  okstra spawn-followups <args...>
+
+All arguments are forwarded verbatim to the python helper. See
+\`okstra spawn-followups --help\` for the full option list.
+`;
+
+export async function run(args) {
+  return runInstalledScript({
+    scriptName: "okstra-spawn-followups.py",
+    args,
+    usage: USAGE,
+  });
+}

package/src/token-usage.mjs

@@ -1,7 +1,4 @@
-import { spawn } from "node:child_process";
-import { join } from "node:path";
-import { promises as fs } from "node:fs";
-import { resolvePaths } from "./paths.mjs";
+import { runInstalledScript } from "./_python-helper.mjs";
 
 const USAGE = `okstra token-usage — collect token usage for a run
 
@@ -15,37 +12,9 @@ Usage:
   okstra token-usage <state-file> [--write] [--summary] [...]
 
 Arguments and flags after the state-file path are forwarded verbatim to
-the python helper. See \`python3 ~/.okstra/bin/okstra-token-usage.py --help\`
-for the full option list.
+the python helper. See \`okstra token-usage --help\` for the full option list.
 `;
 
 export async function run(args) {
-  if (args.length === 0 || args.includes("--help") || args.includes("-h")) {
-    process.stdout.write(USAGE);
-    return args.length === 0 ? 2 : 0;
-  }
-
-  const paths = await resolvePaths();
-  const script = join(paths.bin, "okstra-token-usage.py");
-
-  try {
-    await fs.access(script);
-  } catch {
-    process.stderr.write(
-      `error: ${script} not found — run 'okstra install' (or 'okstra ensure-installed') first\n`,
-    );
-    return 1;
-  }
-
-  return await new Promise((resolve) => {
-    const child = spawn("python3", [script, ...args], {
-      stdio: "inherit",
-      env: { ...process.env, PYTHONPATH: paths.pythonpath },
-    });
-    child.on("error", (err) => {
-      process.stderr.write(`error: failed to spawn python3: ${err.message}\n`);
-      resolve(1);
-    });
-    child.on("close", (code) => resolve(typeof code === "number" ? code : 1));
-  });
+  return runInstalledScript({ scriptName: "okstra-token-usage.py", args, usage: USAGE });
 }