@nurix/nustack 0.10.0-dev.20 → 0.10.0-dev.22

package/dist/lib/session-engine/frames.js

@@ -43,7 +43,12 @@ export function parseInboundFrame(line) {
             const permissionMode = typeof frame.permissionMode === "string" ? frame.permissionMode : undefined;
             const isolated = frame.isolated === true ? true : undefined;
             const resumeSessionId = typeof frame.resumeSessionId === "string" && frame.resumeSessionId !== "" ? frame.resumeSessionId : undefined;
-            return { ok: true, frame: { v: FRAME_VERSION, type, sessionId, projectPath, permissionMode, isolated, resumeSessionId } };
+            const rawCommit = typeof frame.commit === "string" ? frame.commit : null;
+            if (rawCommit !== null && !/^[0-9a-f]{7,64}$/.test(rawCommit)) {
+                return { ok: false, error: { code: "BAD_FRAME", name: type, message: "session.open commit must be a hex object name" } };
+            }
+            const commit = rawCommit ?? undefined;
+            return { ok: true, frame: { v: FRAME_VERSION, type, sessionId, projectPath, permissionMode, isolated, commit, resumeSessionId } };
         }
         case "session.turn": {
             const sessionId = requireString("sessionId");

package/dist/lib/session-engine/supervisor.js

@@ -91,7 +91,7 @@ export class SessionSupervisor {
                 await this.shutdown();
                 return;
             case "session.open":
-                await this.openSession(frame.sessionId, frame.projectPath, frame.permissionMode, frame.isolated, frame.resumeSessionId);
+                await this.openSession(frame.sessionId, frame.projectPath, frame.permissionMode, frame.isolated, frame.resumeSessionId, frame.commit);
                 return;
             case "session.turn": {
                 const session = this.sessions.get(frame.sessionId);
@@ -131,11 +131,16 @@ export class SessionSupervisor {
                 return;
         }
     }
-    async openSession(sessionId, projectPath, permissionMode, isolated, resumeSessionId) {
+    async openSession(sessionId, projectPath, permissionMode, isolated, resumeSessionId, commit) {
         if (this.sessions.has(sessionId))
             return this.error(sessionId, "SESSION_ALREADY_OPEN", `session ${sessionId} is already open`);
         this.status(sessionId, "starting");
-        const worktree = await createSessionWorktree(projectPath, sessionId, this.env, isolated === true);
+        const worktree = await createSessionWorktree(projectPath, sessionId, this.env, isolated === true, commit);
+        if (worktree.commitRefusal !== null) {
+            this.error(sessionId, worktree.commitRefusal.code, worktree.commitRefusal.detail);
+            this.status(sessionId, "error", `could not open ${String(commit)}`);
+            return;
+        }
         const record = {
             sessionId,
             projectPath,
@@ -229,6 +234,7 @@ export class SessionSupervisor {
             worktreePath: worktree.worktreePath,
             branch: worktree.branch,
             isolated: worktree.isolated,
+            commit: worktree.baseCommit,
         });
         this.status(sessionId, "ready");
     }

package/dist/lib/session-engine/worktree.js

@@ -10,6 +10,7 @@ export function sessionsHome(env = process.env) {
     return path.join(os.homedir(), ".nustack", "sessions");
 }
 export const LEGACY_ENGINE_BRANCH_PREFIX = "nustack/lane-";
+const FETCH_TIMEOUT_MS = 10 * 60_000;
 export function legacyEngineHome(env = process.env) {
     const override = env.NUSTACK_LEGACY_ENGINE_HOME;
     if (override && override !== "")
@@ -19,13 +20,13 @@ export function legacyEngineHome(env = process.env) {
 function git(args, cwd) {
     return gitOutcome(args, cwd).then((outcome) => (outcome.ok ? outcome.stdout : null));
 }
-export function gitOutcome(args, cwd) {
+export function gitOutcome(args, cwd, timeoutMs = 15_000) {
     return new Promise((resolve) => {
         const failed = (error) => {
             resolve({ ok: false, code: null, stdout: "", stderr: error instanceof Error ? error.message : String(error) });
         };
         try {
-            execFile("git", args, { cwd, timeout: 15_000 }, (error, stdout, stderr) => {
+            execFile("git", args, { cwd, timeout: timeoutMs }, (error, stdout, stderr) => {
                 const raw = error?.code;
                 const code = error ? (typeof raw === "number" ? raw : null) : 0;
                 resolve({ ok: !error, code, stdout: stdout.trim(), stderr: stderr.trim() });
@@ -36,21 +37,53 @@ export function gitOutcome(args, cwd) {
         }
     });
 }
-export async function createSessionWorktree(projectPath, sessionId, env = process.env, isolate = false) {
-    const inPlace = { worktreePath: projectPath, branch: null, isolated: false, baseBranch: null, baseCommit: null };
-    if (!isolate)
+export async function createSessionWorktree(projectPath, sessionId, env = process.env, isolate = false, commit) {
+    const inPlace = {
+        worktreePath: projectPath,
+        branch: null,
+        isolated: false,
+        baseBranch: null,
+        baseCommit: null,
+        commitRefusal: null,
+    };
+    if (!isolate && commit === undefined)
         return inPlace;
     const isRepo = await git(["rev-parse", "--is-inside-work-tree"], projectPath);
-    if (isRepo !== "true")
-        return inPlace;
+    if (isRepo !== "true") {
+        return commit === undefined
+            ? inPlace
+            : { ...inPlace, commitRefusal: { code: "COMMIT_UNREACHABLE", detail: `${projectPath} is not a git checkout, so ${commit} cannot be opened here.` } };
+    }
+    if (commit !== undefined) {
+        const refusal = await fetchCommit(projectPath, commit);
+        if (refusal !== null)
+            return { ...inPlace, commitRefusal: refusal };
+    }
     const head = await git(["rev-parse", "--abbrev-ref", "HEAD"], projectPath);
     const baseBranch = head === null || head === "HEAD" ? null : head;
-    const baseCommit = await git(["rev-parse", "HEAD"], projectPath);
     const branch = `${ENGINE_SESSION_BRANCH_PREFIX}${sessionId}`;
     const worktreePath = path.join(sessionsHome(env), "worktrees", sessionId);
     await mkdir(path.dirname(worktreePath), { recursive: true });
-    const added = await git(["worktree", "add", worktreePath, "-b", branch], projectPath);
-    if (added === null)
-        return inPlace;
-    return { worktreePath, branch, isolated: true, baseBranch, baseCommit };
+    const added = await git(commit === undefined
+        ? ["worktree", "add", worktreePath, "-b", branch]
+        : ["worktree", "add", worktreePath, "-b", branch, commit], projectPath);
+    if (added === null) {
+        return commit === undefined
+            ? inPlace
+            : { ...inPlace, commitRefusal: { code: "COMMIT_UNREACHABLE", detail: `git refused a worktree for ${commit} in ${projectPath}.` } };
+    }
+    const baseCommit = await git(["rev-parse", "HEAD"], worktreePath);
+    return { worktreePath, branch, isolated: true, baseBranch, baseCommit, commitRefusal: null };
+}
+async function fetchCommit(projectPath, commit) {
+    const has = () => gitOutcome(["cat-file", "-e", `${commit}^{commit}`], projectPath);
+    if ((await has()).ok)
+        return null;
+    let fetched = await gitOutcome(["fetch", "origin", commit], projectPath, FETCH_TIMEOUT_MS);
+    if (!fetched.ok)
+        fetched = await gitOutcome(["fetch", "origin"], projectPath, FETCH_TIMEOUT_MS);
+    if ((await has()).ok)
+        return null;
+    const said = `${fetched.stderr}\n${fetched.stdout}`.trim();
+    return { code: "COMMIT_UNREACHABLE", detail: said === "" ? `${commit} is not in this checkout and origin did not have it.` : said };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nurix/nustack",
-  "version": "0.10.0-dev.20",
+  "version": "0.10.0-dev.22",
   "description": "The nustack CLI — bootstrap NuStack services into a repo via the NuStack discovery plane.",
   "type": "module",
   "private": false,
@@ -26,16 +26,16 @@
     "commander": "^14.0.0"
   },
   "optionalDependencies": {
-    "@nurix/codegraph": "0.2.1",
-    "@nurix/logscope": "0.1.0"
+    "@nurix/logscope": "0.1.0",
+    "@nurix/codegraph": "0.2.1"
   },
   "devDependencies": {
     "@ngneat/falso": "^8.0.2",
     "@types/node": "^22.19.20",
     "typescript": "^5.7.2",
     "vitest": "^4.1.11",
-    "@nurix/nustack.ui": "0.0.0",
-    "@nurix/nustack.studio": "0.0.0"
+    "@nurix/nustack.studio": "0.0.0",
+    "@nurix/nustack.ui": "0.0.0"
   },
   "publishConfig": {
     "access": "public"