@tablation/crew 0.1.6 → 0.2.0

package/README.md

@@ -211,7 +211,7 @@ crew pause|resume [route] [R]  pause everything, or one role
 crew log [route]               tail the log
 crew inbox [--member NAME]    your tickets across every workspace
 crew connect WS[/PROJECT]     resolve a workspace/project's ids into the state tree
-crew repos add ROUTE PATH     attach a local checkout to a route in crew.yaml, creating its Repos row if missing (--dry-run previews)
+crew repos add [ROUTE] [NAME] [PATH]  attach a local checkout to a route in crew.yaml, creating its Repos row if missing (--dry-run previews)
 crew repos list ROUTE         the checkouts a route has, and the tracker Repos row each matches
 crew install                  write and load this platform's scheduler unit
 crew uninstall                unload and remove it

package/dist/cli.js

@@ -2793,6 +2793,12 @@ function gitOk(cwd, args) {
     return null;
   }
 }
+function commitDate(cwd, sha) {
+  const out = gitOk(cwd, ["show", "-s", "--format=%cI", sha]);
+  if (!out) return null;
+  const t = new Date(out);
+  return Number.isNaN(t.getTime()) ? null : t.toISOString();
+}
 var currentBranch = (cwd) => git(cwd, ["rev-parse", "--abbrev-ref", "HEAD"]);
 var headSha = (cwd) => git(cwd, ["rev-parse", "HEAD"]);
 function status(cwd) {
@@ -4980,7 +4986,10 @@ function planStamp(cwd, tickets, contract, fromSha, toSha, merged = /* @__PURE__
     return null;
   }).filter((p) => p !== null);
 }
-async function applyStamp(tracker, plan, version, contract, emit, dryRun) {
+function mergedAtFor(cwd, sha, fallback) {
+  return cwd && commitDate(cwd, sha) || fallback;
+}
+async function applyStamp(tracker, plan, version, contract, emit, dryRun, cwd) {
   let stamped = 0;
   const at = (/* @__PURE__ */ new Date()).toISOString();
   for (const { ticket, sha } of plan) {
@@ -5000,10 +5009,9 @@ async function applyStamp(tracker, plan, version, contract, emit, dryRun) {
         ...version ? { released_version: version } : {},
         // Written here rather than only on the external path (below): a
         // ticket's record should mean the same thing regardless of which
-        // release mode closed it (ISSUE-218). `merged_at` is stamped
-        // alongside — not read off the commit itself — since that is the
-        // moment the tracker learns of it, same as the external path.
-        ...sha ? { commit_sha: sha, merged_at: at } : {}
+        // release mode closed it (ISSUE-218). `merged_at` is the commit's own
+        // date, not the stamp time (which trails the deploy in ci_* modes).
+        ...sha ? { commit_sha: sha, merged_at: mergedAtFor(cwd, sha, at) } : {}
       });
       emit.emit(`stamped ${contract.statuses.deployed}${version ? ` (${version})` : ""}${shaNote}`, {
         ticket: ticket.issue_id
@@ -5015,7 +5023,7 @@ async function applyStamp(tracker, plan, version, contract, emit, dryRun) {
   }
   return stamped;
 }
-async function applyExternalClosures(tracker, closures, contract, emit, dryRun) {
+async function applyExternalClosures(tracker, closures, contract, emit, dryRun, cwd) {
   if (!closures?.length) return 0;
   let stamped = 0;
   const at = (/* @__PURE__ */ new Date()).toISOString();
@@ -5030,7 +5038,7 @@ async function applyExternalClosures(tracker, closures, contract, emit, dryRun)
     try {
       await tracker.updateTicket(ticket.id, {
         commit_sha: closure.mergedAt,
-        merged_at: at,
+        merged_at: mergedAtFor(cwd, closure.mergedAt, at),
         ...confirmed ? { status: contract.statuses.deployed, released_at: at, ...version ? { released_version: version } : {} } : {}
       });
       emit.emit(`stamped commit_sha (${closure.mergedAt.slice(0, 8)})${shippedNote}`, { ticket: ticket.issue_id });
@@ -7034,6 +7042,27 @@ function matchRepoName(origin, resolved) {
   }
   return void 0;
 }
+function routeNamesOf(text) {
+  const routes = parseDocument(text).get("routes", true);
+  if (!isSeq(routes)) return [];
+  return routes.items.flatMap((i) => isMap(i) && typeof i.get("route") === "string" ? [i.get("route")] : []);
+}
+function parseAddArgs(args, routes, isDir) {
+  const rest = [...args];
+  let route;
+  if (rest.length > 0 && routes.includes(rest[0])) route = rest.shift();
+  else if (rest.length > 0 && /^[^/\s]+\/[^/\s]+$/.test(rest[0]) && !isDir(rest[0])) {
+    throw new ReposError(`no route "${rest[0]}" in the config (have: ${routes.join(", ") || "none"})`);
+  }
+  if (!route) {
+    if (routes.length === 1) route = routes[0];
+    else throw new ReposError(routes.length === 0 ? "the config has no routes \u2014 run `crew connect` first" : `several routes are configured; name one: ${routes.join(", ")}`);
+  }
+  if (rest.length > 2) throw new ReposError("too many arguments: expected [route] [name] [path]");
+  if (rest.length === 2) return { route, name: rest[0], path: rest[1] };
+  if (rest.length === 1) return isDir(rest[0]) ? { route, path: rest[0] } : { route, name: rest[0], path: "." };
+  return { route, path: "." };
+}
 function expandDir(p, base) {
   const home = p === "~" ? homedir3() : p.startsWith("~/") ? `${homedir3()}/${p.slice(2)}` : p;
   return resolve3(base, home);
@@ -7073,7 +7102,7 @@ function planRepoAdd(i) {
     throw new ReposError(`${target} is already configured on route ${i.route}`);
   }
   const matched = matchRepoName(i.origin, i.resolved);
-  const name = matched ?? i.name ?? basename5(target);
+  const name = matched ?? i.name ?? normalizeRemote(i.origin)?.split("/").pop() ?? basename5(target);
   let warning;
   if (!matched) {
     const known = Object.values(i.resolved?.repoNames ?? {});
@@ -8319,7 +8348,7 @@ function usage() {
   crew agents sync [route] [--force]   push crew's personas AND skill files into the workspace Agents/Agent Skills tables (--force overwrites even a diverged persona)
   crew agents prompt R [route] print one persona's current prompt (e.g. R=pair, for a SessionStart hook)
   crew skills sync [route]      push only crew's skill files (e.g. grill-me) into the workspace Agent Skills table
-  crew repos add ROUTE PATH     attach a local checkout to a route in crew.yaml (--dry-run previews)
+  crew repos add [ROUTE] [NAME] [PATH]  attach a local checkout to a route in crew.yaml (--dry-run previews)
   crew repos list ROUTE         the checkouts a route has, with the tracker's Repos row each matches
   crew logbook list [route]     recent Agent Log entries, filterable by --role/--ticket
   crew logbook show [route] ID [--prompt]   one entry; --prompt reconstructs and verifies its prompt
@@ -8822,12 +8851,12 @@ ${changed2.map((c) => `  - ${c}
           outcome.decision.head,
           new Map(outcome.merged.map((m) => [m.ticket.issue_id, m.sha]))
         );
-        if (plan.length) await applyStamp(tracker, plan, outcome.version, tracker.contract, remit, dryRun);
+        if (plan.length) await applyStamp(tracker, plan, outcome.version, tracker.contract, remit, dryRun, target.dir);
       } else if (outcome.stopped) {
         remit.emit(`nothing stamped \u2014 ${outcome.stopped}`);
       }
       if (outcome.externalClosures?.length) {
-        await applyExternalClosures(tracker, outcome.externalClosures, tracker.contract, remit, dryRun);
+        await applyExternalClosures(tracker, outcome.externalClosures, tracker.contract, remit, dryRun, target.dir);
       }
       const news = describeRelease(outcome, scope);
       if (news) {
@@ -9605,12 +9634,31 @@ ${changed2.map((c) => `  - ${c}
     }
     case "repos": {
       const sub = positional[1];
-      const routeName = positional[2];
       const usage2 = () => {
-        process.stderr.write("crew repos add <workspace/project> <path> [--name N] [--project P] [--dry-run] [--no-create]\ncrew repos list <workspace/project>\n");
+        process.stderr.write("crew repos add [workspace/project] [name] [path] [--name N] [--project P] [--dry-run] [--no-create]\ncrew repos list <workspace/project>\n");
         process.exit(2);
       };
-      if (sub !== "add" && sub !== "list" || !routeName || sub === "add" && !positional[3]) usage2();
+      if (sub !== "add" && sub !== "list") usage2();
+      const configText = readFileSync12(cfg.configFile, "utf8");
+      let routeName = positional[2];
+      let addPath = ".";
+      let addName;
+      if (sub === "list" && !routeName) usage2();
+      if (sub === "add") {
+        try {
+          const a = parseAddArgs(positional.slice(2), routeNamesOf(configText), (p) => existsSync18(resolvePath(p.replace(/^~(?=\/|$)/, homedir4()))));
+          routeName = a.route;
+          addPath = a.path;
+          addName = a.name;
+        } catch (e) {
+          if (e instanceof ReposError) {
+            process.stderr.write(`crew repos: ${e.message}
+`);
+            process.exit(2);
+          }
+          throw e;
+        }
+      }
       const resolvedFile = resolvedPathFor(cfg.ship.stateDir, routeName);
       let resolvedRemotes;
       if (existsSync18(resolvedFile)) {
@@ -9620,7 +9668,7 @@ ${changed2.map((c) => `  - ${c}
         }
       }
       const originOf = (dir) => gitOk(dir, ["remote", "get-url", "origin"]) ?? void 0;
-      const text = readFileSync12(cfg.configFile, "utf8");
+      const text = configText;
       const base = dirname9(cfg.configFile);
       try {
         if (sub === "list") {
@@ -9636,7 +9684,7 @@ ${changed2.map((c) => `  - ${c}
           }
           break;
         }
-        const target = resolvePath(positional[3].replace(/^~(?=\/|$)/, homedir4()));
+        const target = resolvePath(addPath.replace(/^~(?=\/|$)/, homedir4()));
         const top = existsSync18(target) ? gitOk(target, ["rev-parse", "--show-toplevel"]) : null;
         if (!top) throw new ReposError(`${target} is not a git checkout`);
         const origin = originOf(top);
@@ -9647,7 +9695,7 @@ ${changed2.map((c) => `  - ${c}
           path: top,
           origin,
           resolved: resolvedRemotes,
-          name: value("name"),
+          name: value("name") ?? addName,
           nameForExisting: (d) => matchRepoName(originOf(d), resolvedRemotes)
         });
         let rowTracker;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tablation/crew",
-  "version": "0.1.6",
+  "version": "0.2.0",
   "description": "A standing team of headless agents that picks work off a Tablation board, does it on a machine you control, and reports back.",
   "type": "module",
   "license": "MIT",