run402 4.70.2 → 4.70.4

package/gitvault-surface.json

@@ -1,5 +1,5 @@
 {
-  "surface_version": "4.70.2",
+  "surface_version": "4.70.4",
   "verbs": [
     "repos create",
     "repos list",

package/lib/path-lookup.mjs

@@ -6,7 +6,7 @@
  * subprocess — a plain directory scan mirrors what the OS loader itself
  * does to resolve an unqualified command name.
  */
-import { accessSync, constants } from "node:fs";
+import {accessSync, constants, readFileSync } from "node:fs";
 import { delimiter, join } from "node:path";
 
 /** True iff `name` resolves to an executable file somewhere on `PATH`. Windows `PATHEXT` is out of scope — this CLI targets POSIX (`engines.node` + the hardened-git doc comments assume it) — so no `.exe`/`.cmd` suffix search. */
@@ -22,3 +22,31 @@ export function isExecutableOnPath(name, env = process.env) {
   }
   return false;
 }
+
+/**
+ * After a restore into `dir`, the ONE thing that still stands between the
+ * caller and its first `git push` is git finding the remote helper the
+ * checkout's origin scheme names (`git-remote-kygit` for `kygit::`,
+ * `git-remote-run402` for `run402::`). A resume or join run through
+ * `npx` has the helper only inside the npx cache, so git cannot see it.
+ * Returns a `next_actions` entry naming the fix, or null when the helper
+ * is on PATH or the checkout's remote cannot be read (never throws).
+ */
+export function remoteHelperNextAction(dir, env = process.env) {
+  let url = null;
+  try {
+    const cfg = readFileSync(join(dir, ".git", "config"), "utf8");
+    const m = cfg.match(/\[remote "origin"\][^[]*?\n\s*url\s*=\s*(\S+)/);
+    url = m ? m[1] : null;
+  } catch {
+    return null;
+  }
+  if (!url) return null;
+  const helper = url.startsWith("kygit::") ? "git-remote-kygit" : url.startsWith("run402::") ? "git-remote-run402" : null;
+  if (!helper || isExecutableOnPath(helper, env)) return null;
+  return {
+    type: "install_remote_helper",
+    command: "npm i -g @kychee/kygit run402",
+    why: `git push needs ${helper} on PATH and this session does not have it there (an npx run keeps it inside the npx cache); install both packages once and every git command in this checkout works`,
+  };
+}

package/lib/path-lookup.test.mjs

@@ -6,10 +6,10 @@
  */
 import { describe, it } from "node:test";
 import assert from "node:assert/strict";
-import { mkdtempSync, chmodSync, writeFileSync, rmSync } from "node:fs";
+import { mkdtempSync, mkdirSync, chmodSync, writeFileSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { isExecutableOnPath } from "./path-lookup.mjs";
+import { isExecutableOnPath, remoteHelperNextAction } from "./path-lookup.mjs";
 
 describe("isExecutableOnPath", () => {
   it("finds an executable file on PATH", () => {
@@ -64,3 +64,29 @@ describe("isExecutableOnPath", () => {
     assert.equal(isExecutableOnPath("git-remote-kygit", { PATH: "" }), false);
   });
 });
+
+describe("remoteHelperNextAction", () => {
+it("names the missing helper for the checkout's remote scheme, and nothing when it is on PATH or the checkout is unreadable", () => {
+  const dir = mkdtempSync(join(tmpdir(), "run402-remote-helper-"));
+  try {
+    mkdirSync(join(dir, ".git"));
+    writeFileSync(join(dir, ".git", "config"), `[core]\n\trepositoryformatversion = 0\n[remote "origin"]\n\turl = kygit::org/name\n\tfetch = +refs/heads/*:refs/remotes/origin/*\n`);
+    const emptyPath = { PATH: dir };
+    const missing = remoteHelperNextAction(dir, emptyPath);
+    assert.equal(missing?.type, "install_remote_helper");
+    assert.match(missing.why, /git-remote-kygit/);
+    assert.equal(missing.command, "npm i -g @kychee/kygit run402");
+    // present on PATH → nothing to say
+    const bin = join(dir, "bin"); mkdirSync(bin);
+    writeFileSync(join(bin, "git-remote-kygit"), "#!/bin/sh\n"); chmodSync(join(bin, "git-remote-kygit"), 0o755);
+    assert.equal(remoteHelperNextAction(dir, { PATH: bin }), null);
+    // run402:: scheme names the other helper
+    writeFileSync(join(dir, ".git", "config"), `[remote "origin"]\n\turl = run402::org/name\n`);
+    assert.match(remoteHelperNextAction(dir, emptyPath).why, /git-remote-run402/);
+    // no checkout → null, never a throw
+    assert.equal(remoteHelperNextAction(join(dir, "nope"), emptyPath), null);
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});
+});

package/lib/repos.mjs

@@ -1918,6 +1918,13 @@ async function resume(args) {
   try {
     const result = await sdk.gitvault.resume({ key, ...(to != null ? { to } : {}), onLine: (line) => console.error(line) });
     if (coldStart.next_action) result.next_actions = [...(result.next_actions ?? []), coldStart.next_action];
+    // The restored checkout's first git command needs the remote helper on
+    // PATH; an npx-run resume/join has it only in the npx cache. Name it.
+    try {
+      const { remoteHelperNextAction } = await import("./path-lookup.mjs");
+      const helperAction = result.restored?.dir ? remoteHelperNextAction(result.restored.dir) : null;
+      if (helperAction) result.next_actions = [...(result.next_actions ?? []), helperAction];
+    } catch { /* never fails a completed claim */ }
     if (a.includes("--json")) {
       printJson(sdk, { ...result, cold_start: coldStart });
     } else {
@@ -2111,6 +2118,13 @@ async function joinInvite(args) {
     } catch {
       // never fails a completed join
     }
+    // The restored checkout's first git command needs the remote helper on
+    // PATH; an npx-run resume/join has it only in the npx cache. Name it.
+    try {
+      const { remoteHelperNextAction } = await import("./path-lookup.mjs");
+      const helperAction = result.restored?.dir ? remoteHelperNextAction(result.restored.dir) : null;
+      if (helperAction) result.next_actions = [...(result.next_actions ?? []), helperAction];
+    } catch { /* never fails a completed claim */ }
     if (a.includes("--json")) {
       printJson(sdk, { ...result, cold_start: coldStart });
     } else {

package/lib/wallet-context.mjs

@@ -9,7 +9,8 @@
  * into the env var here, at the edge.
  *
  * Precedence (highest first):
- *   1. --wallet <name> / --profile <name>   (flag)
+ *   1. --wallet <name> / --profile <name>   (flag; under `repos`, only --wallet —
+ *      `repos create|mirror|recover --profile <name>` is the AWS credential profile)
  *   2. RUN402_WALLET / RUN402_PROFILE        (env)
  *   3. nearest .run402.local.json/.run402.json (directory binding, walk up)
  *   4. config.json active_wallet              (global `wallets use`)
@@ -41,6 +42,11 @@ export { findBindingKey, bindingFilePath, readBindingFile };
 
 const DEFAULT = "default";
 const GLOBAL_FLAGS = new Set(["--wallet", "--profile"]);
+// `repos` owns `--profile` itself (the AWS credential profile for a BYO
+// destination, a mirror, or a recovery source), so under that command only
+// `--wallet` selects the wallet; RUN402_WALLET and the directory binding still
+// apply. Stripping `--profile` there made the documented s3 flags unreachable.
+const OWNS_PROFILE_FLAG = new Set(["repos"]);
 // The `wallets` group is the management + escape surface — it must work even
 // when selection is ambiguous (so you can `wallets unbind`), and it validates
 // its own positional targets. `init` creates wallets, so it must not fail
@@ -50,7 +56,8 @@ const EXISTENCE_EXEMPT = new Set(["wallets", "init", "doctor"]);
 
 /**
  * Split the global --wallet/--profile flag (and its value) out of argv so the
- * subcommand never sees it. Pure: no core imports, no side effects. Returns
+ * subcommand never sees it — except `--profile` under a command that owns the
+ * flag (OWNS_PROFILE_FLAG), which is passed through untouched. Pure: no core imports, no side effects. Returns
  * the cleaned argv and the selected flag (`{ flag, value }` or null). Last
  * occurrence wins. A missing value is left as `value: undefined` for
  * resolveWallet to reject with a precise error.
@@ -58,16 +65,26 @@ const EXISTENCE_EXEMPT = new Set(["wallets", "init", "doctor"]);
 export function splitWalletFlag(rawArgv = []) {
   const argv = [];
   let flag = null;
+  // The command word: the first positional that is not the value of a global flag.
+  let first;
+  for (let i = 0; i < rawArgv.length && first === undefined; i++) {
+    const a = rawArgv[i];
+    if (typeof a !== "string" || a.startsWith("-")) continue;
+    if (i > 0 && GLOBAL_FLAGS.has(rawArgv[i - 1])) continue;
+    first = a;
+  }
+  const ownsProfile = OWNS_PROFILE_FLAG.has(first);
+  const isGlobal = (name) => GLOBAL_FLAGS.has(name) && !(ownsProfile && name === "--profile");
   for (let i = 0; i < rawArgv.length; i++) {
     const a = rawArgv[i];
     if (typeof a === "string" && a.startsWith("--") && a.includes("=")) {
       const name = a.slice(0, a.indexOf("="));
-      if (GLOBAL_FLAGS.has(name)) {
+      if (isGlobal(name)) {
         flag = { flag: name, value: a.slice(a.indexOf("=") + 1) };
         continue;
       }
     }
-    if (typeof a === "string" && GLOBAL_FLAGS.has(a)) {
+    if (typeof a === "string" && isGlobal(a)) {
       const next = rawArgv[i + 1];
       if (next === undefined || (typeof next === "string" && next.startsWith("-"))) {
         flag = { flag: a, value: undefined };

package/lib/wallet-context.test.mjs

@@ -71,6 +71,18 @@ describe("splitWalletFlag", () => {
     assert.deepEqual(r.argv, ["deploy", "apply", "--manifest", "x"]);
     assert.equal(r.walletFlag.value, "foo");
   });
+  it("leaves --profile to `repos`, which owns it as the AWS credential profile", () => {
+    const r = splitWalletFlag(["repos", "create", "byo-1", "--byo", "s3://b/p", "--profile", "acme", "--region", "us-east-1"]);
+    assert.equal(r.walletFlag, null);
+    assert.deepEqual(r.argv, ["repos", "create", "byo-1", "--byo", "s3://b/p", "--profile", "acme", "--region", "us-east-1"]);
+    const m = splitWalletFlag(["--wallet", "w", "repos", "mirror", "s3://m", "--profile=acme"]);
+    assert.deepEqual(m.walletFlag, { flag: "--wallet", value: "w" });
+    assert.deepEqual(m.argv, ["repos", "mirror", "s3://m", "--profile=acme"]);
+    const rec = splitWalletFlag(["repos", "recover", "s3://m", "--out", "./r", "--profile", "acme"]);
+    assert.equal(rec.walletFlag, null);
+    assert.ok(rec.argv.includes("--profile") && rec.argv.includes("acme"));
+  });
+
   it("accepts --profile as an alias", () => {
     const r = splitWalletFlag(["--profile", "p", "status"]);
     assert.equal(r.walletFlag.flag, "--profile");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "run402",
-  "version": "4.70.2",
+  "version": "4.70.4",
   "description": "CLI for Run402 — full-stack backend infrastructure for AI agents: Postgres, auth, storage, serverless functions and atomic deploys. Paid with x402/MPP. Includes $0.03 image generation.",
   "type": "module",
   "bin": {