okstra 0.162.0 → 0.162.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "okstra",
-  "version": "0.162.0",
+  "version": "0.162.2",
   "description": "Host-aware multi-provider cross-verification orchestrator runtime and agent skills.",
   "license": "MIT",
   "author": "devonshin",

package/runtime/BUILD.json

@@ -1,5 +1,5 @@
 {
-  "package": "0.162.0",
-  "builtAt": "2026-08-08T17:44:47.668Z",
+  "package": "0.162.2",
+  "builtAt": "2026-08-08T18:44:32.842Z",
   "repoRoot": "/home/runner/work/okstra/okstra"
 }

package/runtime/bin/lib/okstra/interactive.sh

@@ -59,14 +59,14 @@ resolve_task_root_for_shortcut() {
   local task_id="$4"
 
   local resolved=""
-  resolved="$(python3 - "$WORKSPACE_ROOT/scripts" "$project_root" "$project_id" "$task_group" "$task_id" <<'PY'
+  resolved="$(python3 - "$OKSTRA_PYTHONPATH" "$project_root" "$project_id" "$task_group" "$task_id" <<'PY'
 import json, os, sys
 from pathlib import Path
 
 # task root 의 slug 경로 구성은 okstra_ctl.paths.task_dir(SSOT) 에 위임한다.
 # 과거 이 heredoc 은 slugify 와 `.okstra/tasks/<slug>/<slug>` 구조를 자체
 # 재구현해 규칙 변경 시 silent drift 위험이 있었다. project-resolver.sh 와
-# 동일하게 $WORKSPACE_ROOT/scripts 를 sys.path 에 올려 패키지를 import 한다.
+# 동일하게 $OKSTRA_PYTHONPATH 를 sys.path 에 올려 패키지를 import 한다.
 sys.path.insert(0, sys.argv[1])
 from okstra_ctl.paths import task_dir
 
@@ -176,7 +176,7 @@ autofill_from_manifest() {
     return 0
   fi
 
-  PYTHONPATH="$WORKSPACE_ROOT/scripts:${PYTHONPATH-}" python3 - "$manifest_project_root" "$manifest_task_root" <<'PY' || true
+  PYTHONPATH="$OKSTRA_PYTHONPATH:${PYTHONPATH-}" python3 - "$manifest_project_root" "$manifest_task_root" <<'PY' || true
 import sys
 from pathlib import Path
 
@@ -298,7 +298,7 @@ find_latest_final_report() {
   }
 
   local found=""
-  found="$(PYTHONPATH="$WORKSPACE_ROOT/scripts:${PYTHONPATH-}" python3 - \
+  found="$(PYTHONPATH="$OKSTRA_PYTHONPATH:${PYTHONPATH-}" python3 - \
              "$task_root" "$task_type_filter" <<'PY'
 import sys
 from okstra_ctl.paths import RunRef
@@ -397,7 +397,7 @@ PY
   local resume_extra_args=()
   while IFS= read -r -d '' _arg; do
     resume_extra_args+=("$_arg")
-  done < <(PYTHONPATH="$WORKSPACE_ROOT/scripts:${PYTHONPATH-}" python3 - \
+  done < <(PYTHONPATH="$OKSTRA_PYTHONPATH:${PYTHONPATH-}" python3 - \
              "$PROJECT_ROOT" "$TASK_GROUP" "$TASK_ID" "$resolved_type" <<'PY'
 import sys
 from okstra_ctl.run_context import latest_run_inputs

package/runtime/bin/lib/okstra/project-resolver.sh

@@ -9,7 +9,7 @@
 # strict/safe 두 종류를 분리한다.
 resolve_project_root_strict() {
   local explicit="${1-}"
-  python3 - "$WORKSPACE_ROOT/scripts" "$explicit" <<'PY'
+  python3 - "$OKSTRA_PYTHONPATH" "$explicit" <<'PY'
 import os, sys
 sys.path.insert(0, sys.argv[1])
 from okstra_project import resolve_project_root, ResolverError
@@ -26,7 +26,7 @@ PY
 # 실패해도 0 으로 종료하고 stdout 은 빈 문자열(autofill 등 best-effort 경로용).
 resolve_project_root_safe() {
   local explicit="${1-}"
-  python3 - "$WORKSPACE_ROOT/scripts" "$explicit" <<'PY'
+  python3 - "$OKSTRA_PYTHONPATH" "$explicit" <<'PY'
 import os, sys
 sys.path.insert(0, sys.argv[1])
 from okstra_project import resolve_project_root, ResolverError
@@ -43,7 +43,7 @@ PY
 upsert_project_json() {
   local project_root="$1"
   local project_id="$2"
-  python3 - "$WORKSPACE_ROOT/scripts" "$project_root" "$project_id" <<'PY'
+  python3 - "$OKSTRA_PYTHONPATH" "$project_root" "$project_id" <<'PY'
 import sys
 sys.path.insert(0, sys.argv[1])
 from pathlib import Path
@@ -55,3 +55,31 @@ except ResolverError as exc:
     sys.exit(1)
 PY
 }
+
+# `okstra setup` 이 이미 기록한 값을 다시 묻지 않기 위한 자동 채움. 프로젝트
+# 안에서 실행하는 한 project-id 와 project-root 는 물어볼 것이 아니라 읽을 것이다.
+autofill_from_project_json() {
+  [[ -n "$PROJECT_ID" && -n "$PROJECT_ROOT" ]] && return 0
+  local resolved
+  resolved="$(python3 - "$OKSTRA_PYTHONPATH" "$PROJECT_ROOT_OVERRIDE" <<'PY' || true
+import json, sys
+from pathlib import Path
+sys.path.insert(0, sys.argv[1])
+from okstra_project import project_json_path
+from okstra_project.resolver import resolve_project_root
+try:
+    root = resolve_project_root(explicit_root=sys.argv[2] or "")
+except Exception:
+    sys.exit(0)
+path = project_json_path(Path(root))
+if not path.is_file():
+    sys.exit(0)
+data = json.loads(path.read_text(encoding="utf-8"))
+print(f"{data.get('projectId', '')}\t{root}")
+PY
+)"
+  [[ -z "$resolved" ]] && return 0
+  [[ -z "$PROJECT_ID" ]] && PROJECT_ID="${resolved%%$'\t'*}"
+  [[ -z "$PROJECT_ROOT" ]] && PROJECT_ROOT="${resolved##*$'\t'}"
+  return 0
+}

package/runtime/bin/okstra.sh

@@ -37,8 +37,25 @@ source "$SCRIPT_DIR/lib/okstra/interactive.sh"
 # shellcheck disable=SC1090
 source "$SCRIPT_DIR/lib/okstra/project-resolver.sh"
 
+# The python packages live at `scripts/` in the repo and at `lib/python/` once
+# installed, and this script runs from both. Assuming the repo layout made the
+# installed launcher die on its first import; that went unnoticed because
+# in-host runs reach python through the Node CLI instead of through here.
+OKSTRA_PYTHONPATH=""
+for candidate in "scripts" "python" "lib/python"; do
+  if [[ -d "$WORKSPACE_ROOT/$candidate/okstra_project" ]]; then
+    OKSTRA_PYTHONPATH="$WORKSPACE_ROOT/$candidate"
+    break
+  fi
+done
+if [[ -z "$OKSTRA_PYTHONPATH" ]]; then
+  printf 'okstra: python package not found under %s — run '"'"'okstra install'"'"'\n' \
+    "$WORKSPACE_ROOT" >&2
+  exit 1
+fi
+
 okstra_py() {
-  PYTHONPATH="$WORKSPACE_ROOT/scripts:${PYTHONPATH-}" python3 "$@"
+  PYTHONPATH="$OKSTRA_PYTHONPATH:${PYTHONPATH-}" python3 "$@"
 }
 
 parse_cli_arguments "$@"
@@ -53,6 +70,7 @@ if [[ "$RESUME_CLARIFICATION_MODE" == "true" ]]; then
   run_resume_clarification
   exit 0
 fi
+autofill_from_project_json
 autofill_from_manifest
 collect_required_arguments
 

package/src/commands/execute/run.mjs

@@ -1,5 +1,6 @@
 import { spawnSync } from "node:child_process";
-import { createInterface } from "node:readline/promises";
+import { existsSync } from "node:fs";
+import { join } from "node:path";
 
 import { runEnsureInstalled } from "../lifecycle/install.mjs";
 import { runPythonModule } from "../../lib/python-helper.mjs";
@@ -106,9 +107,16 @@ export function buildRunPlan({ args, paths, resolution, runManifestPath = "" })
       ok: true,
       kind: "launch-lead",
       reason: resolution.reason,
-      // Not render-only: the lead is actually started, so prepare must commit
-      // the run and emit the launch metadata rather than preview it.
-      commands: [{ name: "prepare", args: renderArgs(args, resolution), capture: true }],
+      // Handed to okstra.sh, which owns input collection and the launch. Only
+      // the runtime is decided here; everything else is passed through so the
+      // launcher can prompt for whatever is still missing.
+      commands: [
+        {
+          name: "launcher",
+          args: ["--lead-runtime", resolution.resolvedRuntime, ...withoutRuntimeSelection(args)],
+          capture: false,
+        },
+      ],
     };
   }
 
@@ -130,68 +138,22 @@ async function runRenderCommand(command, paths) {
   return result;
 }
 
-export function parseLaunchMetadata(stdout) {
-  const marker = "__OKSTRA_LAUNCH__ ";
-  const line = String(stdout || "")
-    .split("\n")
-    .reverse()
-    .find((item) => item.startsWith(marker));
-  return line ? JSON.parse(line.slice(marker.length)) : null;
-}
-
-export function withoutLaunchMetadata(stdout) {
-  return String(stdout || "")
-    .split("\n")
-    .filter((line) => !line.startsWith("__OKSTRA_LAUNCH__ "))
-    .join("\n");
-}
-
-async function confirmSandboxWaiver(launch, args) {
-  if (!launch.sandboxWaiverNote) return true;
-  process.stderr.write(`\n${launch.sandboxWaiverNote}\n`);
-  if (args.includes("--yes")) {
-    process.stderr.write("Proceeding without the sandbox (--yes).\n\n");
-    return true;
-  }
-  const rl = createInterface({ input: process.stdin, output: process.stderr });
-  try {
-    const answer = await rl.question(
-      `Start ${launch.leadExecutable} without its sandbox? [y/N] `,
-    );
-    return answer.trim().toLowerCase() === "y";
-  } finally {
-    rl.close();
-  }
-}
-
-async function launchLead(command, paths, args) {
-  const prepared = await runPythonModule({
-    module: "okstra_ctl.run",
-    args: ["--workspace-root", paths.workspace, ...command.args],
-    stdio: "capture",
-  });
-  process.stdout.write(withoutLaunchMetadata(prepared.stdout));
-  if (prepared.stderr) process.stderr.write(prepared.stderr);
-  if (prepared.code !== 0) return prepared.code ?? 1;
-
-  const launch = parseLaunchMetadata(prepared.stdout);
-  if (!launch) {
-    process.stderr.write("error: prepare did not emit launch metadata\n");
-    return 1;
-  }
-  if (!(await confirmSandboxWaiver(launch, args))) {
+async function launchLead(command, paths) {
+  // okstra.sh already collects missing task inputs, prepares the bundle, asks
+  // about a sandbox waiver, and execs the lead. Reimplementing any of that here
+  // would give the two front doors separate answers to the same questions —
+  // most visibly, this one had no way to ask for a task id and simply forwarded
+  // the gap to python's argument parser.
+  const launcher = join(paths.bin, "okstra.sh");
+  if (!existsSync(launcher)) {
     process.stderr.write(
-      "okstra: cancelled. The task bundle is prepared; rerun to resume it.\n",
+      `error: launcher not found at ${launcher} — run 'okstra install'\n`,
     );
     return 1;
   }
-  const [executable, ...rest] = launch.launchArgv;
-  const started = spawnSync(executable, rest, {
-    cwd: launch.projectRoot,
-    stdio: "inherit",
-  });
+  const started = spawnSync(launcher, command.args, { stdio: "inherit" });
   if (started.error) {
-    process.stderr.write(`error: could not start ${executable}: ${started.error.message}\n`);
+    process.stderr.write(`error: could not start the launcher: ${started.error.message}\n`);
     return 1;
   }
   return started.status ?? 1;
@@ -231,7 +193,7 @@ export async function run(args) {
   if (ensureCode !== 0) return ensureCode;
 
   if (firstPlan.kind === "launch-lead") {
-    return await launchLead(firstPlan.commands[0], paths, args);
+    return await launchLead(firstPlan.commands[0], paths);
   }
 
   const render = firstPlan.commands[0];