aiur-cli 0.0.9-nightly.5a0d430 → 0.0.9-nightly.d4c6e4c

package/bin/aiur.js

@@ -165,8 +165,8 @@ function ensureTmux() {
 // True only when the pinned opencode is on PATH; a wrong (e.g. newer,
 // unverified) version must be replaced with the pin, so presence alone
 // isn't enough.
-function opencodeMatchesPin() {
-  const result = safeSpawn("opencode", ["--version"], { encoding: "utf8" });
+function opencodeMatchesPin(command = "opencode") {
+  const result = safeSpawn(command, ["--version"], { encoding: "utf8" });
   return !result.error && result.status === 0 && (result.stdout || "").trim() === opencodeVersion();
 }
 
@@ -185,40 +185,60 @@ function installOpencode() {
   return !result.error && result.status === 0;
 }
 
+// npm's global bin may be shadowed by another OpenCode on the incoming PATH.
+// Verify the actual installed executable before making it the release's choice.
+function selectGlobalOpencode() {
+  const result = safeSpawn("npm", ["prefix", "-g"], { encoding: "utf8" });
+  if (result.error || result.status !== 0) return false;
+  const prefix = (result.stdout || "").trim();
+  if (!path.isAbsolute(prefix)) return false;
+  const bin = path.join(prefix, "bin");
+  if (!opencodeMatchesPin(path.join(bin, "opencode"))) return false;
+  process.env.PATH = `${bin}${path.delimiter}${process.env.PATH || ""}`;
+  return true;
+}
+
 // opencode powers the interactive "take the wheel" panes. Non-fatal: everything
 // else works without it.
 function ensureOpencode() {
-  if (opencodeMatchesPin()) return;
+  if (opencodeMatchesPin() || selectGlobalOpencode()) return;
   if (process.env.AIUR_SKIP_OPENCODE_INSTALL !== "1") {
     process.stderr.write(
       `aiur: provisioning opencode@${opencodeVersion()} (one-time, for the interactive 'take the wheel' panes)…\n`,
     );
     installOpencode();
-    if (opencodeMatchesPin()) return;
+    if (opencodeMatchesPin() || selectGlobalOpencode()) return;
   }
   process.stderr.write(
-    "aiur: opencode was not found on PATH. The interactive 'take the wheel' " +
+    `aiur: opencode@${opencodeVersion()} is unavailable. The interactive 'take the wheel' ` +
       "feature needs it; everything else works without it. " +
-      "Install from https://opencode.ai\n",
+      `Install with: npm install -g opencode-ai@${opencodeVersion()}, ` +
+      "and put npm's global bin ahead of other opencode binaries on PATH.\n",
   );
 }
 
-// `init` and `--version` run as foreground one-shots that never start the
-// tmux-backed UI, so their tmux/opencode provisioning is irrelevant — and tmux
-// may legitimately be absent on a machine that only ever runs `aiur init`.
-function isForegroundOneShot(argv) {
-  for (const arg of argv) {
-    if (arg === "--version") return true;
-    if (arg.startsWith("-")) continue;
-    return arg === "init";
-  }
-  return false;
+// Match the shared engine's first-argument dispatch: only session launch paths
+// need interactive tools. Unknown commands still reach the engine's usage error.
+function requiresInteractiveTools(argv) {
+  const command = argv[0] || "";
+  if (["", "run", "restart", "--bg"].includes(command)) return true;
+  const nonLaunchCommands = new Set([
+    "__identity", "help", "-h", "-help", "--h", "--help", "--version", "--todo", "--only",
+    "init", "findings", "ask", "asks", "status", "usage", "agents", "commands", "units",
+    "build-orders", "analytics", "github-cost", "github-usage", "alerts", "watch", "set",
+    "upgrade", "pause", "resume", "reset-budget", "message", "cleanup-stale", "stop",
+    "executor-answer", "executor-escalate", "executor-moot", "executor-listen", "executor-wait",
+    "executor-emit", "executor-subscribe", "executor-unsubscribe", "executor-subscriptions",
+    "executor-roster", "executor-fast-forward", "executor-claim", "executor-release", "executor-revoke",
+  ]);
+  if (nonLaunchCommands.has(command)) return false;
+  return command.startsWith("-") || fs.existsSync(command);
 }
 
 function main() {
   const releaseDir = resolveReleaseDir();
 
-  if (!isForegroundOneShot(process.argv.slice(2))) {
+  if (requiresInteractiveTools(process.argv.slice(2))) {
     ensureTmux();
     ensureOpencode();
   }

package/libexec/aiur-engine.sh

@@ -450,6 +450,9 @@ usage() {
 Usage: aiur [--interactive] [--no-dashboard] [--executor] [--pause] [--max-agents <n>] [--logs-root <path>] [--port <port>] [--host <host>] [config-path]
        aiur run [--bg] [--no-dashboard] [--executor] [--debug]  explicit launch form (foreground unless --bg)
        aiur init [--force]   scaffold .aiur/config (interactive setup wizard)
+       aiur login <harness> <name> [--dir <path>]  sign in to a supported backend account
+       aiur accounts [<harness>] [--json]  list registered accounts
+       aiur logout <harness> <name> [--purge]  remove a backend account
        aiur --bg [--no-dashboard] [--executor] [--debug]   start detached; dashboard on unless suppressed
        aiur stop             stop the running session
        aiur restart [--no-build] [run flags]  stop, refresh the build, start again (detached)
@@ -472,6 +475,7 @@ Usage: aiur [--interactive] [--no-dashboard] [--executor] [--pause] [--max-agent
        aiur executor-emit <topic> --payload <json>  publish an Executor event
        aiur executor-subscribe|executor-unsubscribe <pattern>
        aiur executor-subscriptions  list persistent Executor bindings
+       aiur workspace-recover <ticket-identifier> <generation>  release a held workspace after verified provider exit
        aiur executor-roster [--json]  list Executor consumers with their liveness evidence
        aiur executor-claim [--as <id>]  claim the wake stream, or refuse and name the live owner
        aiur executor-release [--as <id>]  give up this consumer's claim
@@ -522,6 +526,47 @@ run_init() {
   exec "${release_cmd[@]}"
 }
 
+run_local_cli() {
+  resolve_release
+  build_init_cmd
+  init_argv_file
+  write_argv "$@"
+  export AIUR_ARGV_FILE="$argv_file"
+  exec "${release_cmd[@]}"
+}
+
+run_claude_login() {
+  resolve_release
+  local profile_dir
+  build_init_cmd
+  init_argv_file
+  write_argv "__login_prepare" "${@:2}"
+  export AIUR_ARGV_FILE="$argv_file"
+  profile_dir="$("${release_cmd[@]}")" || return $?
+  [ -n "$profile_dir" ] || { echo "aiur: account profile directory is unavailable" >&2; return 1; }
+  exec env "CLAUDE_CONFIG_DIR=$profile_dir" claude
+}
+
+run_account_login() {
+  local harness="$2"
+  case "$harness" in
+    kimi|deepseek|openrouter) run_local_cli "$@"; return $? ;;
+  esac
+  resolve_release
+  local profile_dir
+  build_init_cmd
+  init_argv_file
+  write_argv "__login_prepare" "$harness" "${@:3}"
+  export AIUR_ARGV_FILE="$argv_file"
+  profile_dir="$("${release_cmd[@]}")" || return $?
+  [ -n "$profile_dir" ] || { echo "aiur: account profile directory is unavailable" >&2; return 1; }
+  case "$harness" in
+    claude) exec env "CLAUDE_CONFIG_DIR=$profile_dir" claude ;;
+    codex) exec env "CODEX_HOME=$profile_dir" codex ;;
+    *) echo "aiur: unsupported account harness: $harness" >&2; return 64 ;;
+  esac
+}
+
 # --- one-shot: --todo (control RPC; requires a running daemon) ----------------
 
 parsed_todo_only=0
@@ -723,22 +768,10 @@ scrub_run_only_env() {
 }
 
 run_argv=()
-# Default dashboard bind host. Prefer this machine's Tailscale IPv4 so the
-# dashboard is reachable across the tailnet by default (when config omits it);
-# fall back to loopback when Tailscale is absent, or when dashboard credentials
-# are unset (a non-loopback bind requires them, so we stay on loopback rather
-# than refuse to start). The BEAM applies this below an explicit `server.host`,
-# while an explicit `--host` remains the highest-precedence value.
+# Default dashboard bind host. Remote access is an explicit operator choice.
+# The BEAM applies this below `server.host`; `--host` has highest precedence.
 default_dashboard_host() {
-  local ip=""
-  if command -v tailscale >/dev/null 2>&1; then
-    ip="$(tailscale ip -4 2>/dev/null | grep -m1 -E '^100\.[0-9]+\.[0-9]+\.[0-9]+$' || true)"
-  fi
-  if [ -n "$ip" ] && [ -n "${AIUR_DASHBOARD_USERNAME:-}" ] && [ -n "${AIUR_DASHBOARD_PASSWORD:-}" ]; then
-    printf '%s' "$ip"
-  else
-    printf '127.0.0.1'
-  fi
+  printf '%s' "${AIUR_DEFAULT_DASHBOARD_HOST:-127.0.0.1}"
 }
 
 build_run_argv() {
@@ -2633,6 +2666,44 @@ cmd_usage() {
   run_control_rpc "Aiur.AgentControlCLI.usage()"
 }
 
+cmd_accounts() {
+  local json_arg=false harness="" arg encoded expression
+  for arg in "$@"; do
+    case "$arg" in
+      --json)
+        [ "$json_arg" = false ] || die "accounts accepts --json only once"
+        json_arg=true
+        ;;
+      --all)
+        ;;
+      -*)
+        die "accounts accepts an optional harness and --json"
+        ;;
+      *)
+        [ -z "$harness" ] || die "accounts accepts only one harness"
+        harness="$arg"
+        ;;
+    esac
+  done
+
+  resolve_release || return $?
+  prepare_distribution || die "distribution setup failed; cannot contact aiur"
+  resolve_control_identity_from_records
+  if [ "$(probe_node_liveness)" = "down" ]; then
+    # The local one-shot CLI renders the identity and marks usage unavailable.
+    # It never makes a provider request.
+    run_local_cli accounts "$@"
+  else
+    if [ -n "$harness" ]; then
+      encoded="$(printf '%s' "$harness" | base64 | tr -d '\n')"
+      expression="Aiur.AgentControlCLI.accounts($json_arg, Base.decode64!(\"$encoded\"))"
+    else
+      expression="Aiur.AgentControlCLI.accounts($json_arg)"
+    fi
+    run_control_rpc "$expression"
+  fi
+}
+
 cmd_pause_resume() {
   local command="$1"
   shift
@@ -2680,6 +2751,16 @@ cmd_reset_budget() {
   run_control_rpc "$expression"
 }
 
+# Requires the operator to name the exact ticket and generation shown by
+# status. The daemon independently verifies the recorded boot proof.
+cmd_workspace_recover() {
+  [ "$#" -eq 2 ] || { echo "aiur: workspace-recover expects a ticket identifier and generation (e.g. aiur workspace-recover ENG-123 7)" >&2; exit 64; }
+  local ticket="$1" generation="$2" encoded
+  [[ "$generation" =~ ^[1-9][0-9]*$ ]] || { echo "aiur: workspace-recover generation must be a positive integer" >&2; exit 64; }
+  encoded="$(printf '%s' "$ticket" | base64 | tr -d '\n')"
+  run_control_rpc "Aiur.AgentControlCLI.recover_workspace(Base.decode64!(\"$encoded\"), $generation)"
+}
+
 # `aiur message <issue> <text>` — deliver Executor text to one running agent.
 # The text is base64-encoded for the RPC hop so arbitrary content (quotes,
 # backslashes, `#{}`, newlines) survives without Elixir-string escaping.
@@ -4106,6 +4187,16 @@ aiur_engine_main() {
     init)
       run_init "$@"
       ;;
+    login)
+      run_account_login "$@"
+      ;;
+    accounts)
+      shift
+      cmd_accounts "$@"
+      ;;
+    logout)
+      run_local_cli "$@"
+      ;;
     findings)
       run_findings "$@"
       ;;
@@ -4231,6 +4322,10 @@ aiur_engine_main() {
       shift
       cmd_reset_budget "$@"
       ;;
+    workspace-recover)
+      shift
+      cmd_workspace_recover "$@"
+      ;;
     message)
       shift
       cmd_message "$@"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiur-cli",
-  "version": "0.0.9-nightly.5a0d430",
+  "version": "0.0.9-nightly.d4c6e4c",
   "description": "AI Unit Runtime for Executors.",
   "license": "Apache-2.0",
   "homepage": "https://github.com/aiur-team/aiur",
@@ -35,8 +35,8 @@
   ],
   "opencodeVersion": "1.17.10",
   "optionalDependencies": {
-    "aiur-cli-linux-x64": "0.0.9-nightly.5a0d430",
-    "aiur-cli-linux-arm64": "0.0.9-nightly.5a0d430",
-    "aiur-cli-darwin-arm64": "0.0.9-nightly.5a0d430"
+    "aiur-cli-linux-x64": "0.0.9-nightly.d4c6e4c",
+    "aiur-cli-linux-arm64": "0.0.9-nightly.d4c6e4c",
+    "aiur-cli-darwin-arm64": "0.0.9-nightly.d4c6e4c"
   }
 }