syntaur 0.34.0 → 0.35.0

package/dist/index.js

@@ -4234,7 +4234,7 @@ Before starting work, read these files in order:
 ## Context File
 
 - Treat \`.syntaur/context.json\` in the current working directory as the active assignment context when it exists.
-- Use that file to resolve the workspace boundary, assignment path, project path, and active session ID.
+- Use that file to resolve the workspace boundary, assignment path, and project path (the active assignment binding). The active session id, however, is resolved from *your* running process -- prefer \`$CLAUDE_CODE_SESSION_ID\` (or the peer \`OPENCODE_SESSION_ID\` / \`PI_SESSION_ID\`), otherwise run \`syntaur session resolve-id\`; the \`sessionId\` scalar in context.json is only a clobberable legacy hint, not authoritative.
 - If there is no context file yet and you are supposed to work on an assignment, claim or set up the assignment before editing code.
 
 ## Directory Structure
@@ -26002,8 +26002,8 @@ async function moveTodo(id, options) {
       throw new Error(`Plan directory already exists at target: ${newPlanDir}; refusing to move.`);
     }
     const { rename: rename11, mkdir: mkdir12 } = await import("fs/promises");
-    const { dirname: dirname24 } = await import("path");
-    await mkdir12(dirname24(newPlanDir), { recursive: true });
+    const { dirname: dirname25 } = await import("path");
+    await mkdir12(dirname25(newPlanDir), { recursive: true });
     await rename11(item.planDir, newPlanDir);
     item.planDir = newPlanDir;
   }
@@ -27739,7 +27739,8 @@ function isBundleContext(ctx) {
 }
 function isStandaloneSession(ctx) {
   if (!ctx) return false;
-  return !hasAnyAssignmentField(ctx) && !hasAnyBundleField(ctx) && typeof ctx.sessionId === "string" && ctx.sessionId.length > 0;
+  const hasSessionMeta = typeof ctx.sessionId === "string" && ctx.sessionId.length > 0 || typeof ctx.transcriptPath === "string" && ctx.transcriptPath.length > 0;
+  return !hasAnyAssignmentField(ctx) && !hasAnyBundleField(ctx) && hasSessionMeta;
 }
 async function loadContext(ctx) {
   const path = resolve64(ctx.cwd, ".syntaur", "context.json");
@@ -29333,7 +29334,7 @@ function classifyContext(ctx) {
   const hasAssignment = Boolean(ctx.assignmentDir) || Boolean(ctx.assignmentSlug) || Boolean(ctx.projectSlug);
   if (hasAssignment) return "assignment";
   if (ctx.bundleId) return "bundle";
-  if (ctx.sessionId) return "standalone";
+  if (ctx.sessionId || ctx.transcriptPath) return "standalone";
   return "empty";
 }
 async function readAssignmentFrontmatterId(assignmentDir) {
@@ -31649,7 +31650,8 @@ async function extractClaudeSessionMeta(jsonlPath) {
     sessionId,
     cwd,
     startTs,
-    endTs
+    endTs,
+    path: jsonlPath
   };
 }
 async function extractCodexSessionMeta(jsonlPath) {
@@ -31694,7 +31696,8 @@ async function extractCodexSessionMeta(jsonlPath) {
       sessionId: id,
       cwd,
       startTs: timestamp,
-      endTs
+      endTs,
+      path: jsonlPath
     };
   } finally {
     await handle.close().catch(() => {
@@ -31721,7 +31724,7 @@ async function* walkClaudeProjects(opts = {}) {
         const sessionId = f.name.replace(/\.jsonl$/, "");
         const startTs = await readFirstTimestamp(filePath);
         const endTs = await readLastTimestamp(filePath);
-        meta = { tool: "claude", sessionId, cwd: cachedCwd, startTs, endTs };
+        meta = { tool: "claude", sessionId, cwd: cachedCwd, startTs, endTs, path: filePath };
       } else {
         meta = await extractClaudeSessionMeta(filePath);
         if (meta) cachedCwd = meta.cwd;
@@ -32472,6 +32475,123 @@ init_timestamp();
 import { Command as Command10 } from "commander";
 import { readFile as readFile55, readdir as readdir28, stat as stat12 } from "fs/promises";
 import { resolve as resolve78 } from "path";
+
+// src/utils/session-id.ts
+import { execFileSync as execFileSync3 } from "child_process";
+import { mkdirSync as mkdirSync3, readFileSync as readFileSync2, statSync as statSync3, writeFileSync as writeFileSync2 } from "fs";
+import { homedir as homedir13 } from "os";
+import { dirname as dirname24, join as join20 } from "path";
+var SESSION_ID_ENV_VARS = [
+  "CLAUDE_CODE_SESSION_ID",
+  "OPENCODE_SESSION_ID",
+  "PI_SESSION_ID"
+];
+var SAFE_SESSION_ID = /^[A-Za-z0-9_-]+$/;
+function isSafeSessionId(value) {
+  return typeof value === "string" && value.length > 0 && value.length <= 256 && SAFE_SESSION_ID.test(value);
+}
+function defaultReadPpid(pid) {
+  if (!Number.isFinite(pid) || pid <= 1) return null;
+  try {
+    const out = execFileSync3("ps", ["-o", "ppid=", "-p", String(pid)], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"]
+    });
+    const parent = Number.parseInt(out.trim(), 10);
+    return Number.isInteger(parent) && parent > 0 ? parent : null;
+  } catch {
+    return null;
+  }
+}
+function defaultStatMtimeMs(path) {
+  try {
+    return statSync3(path).mtimeMs;
+  } catch {
+    return null;
+  }
+}
+function readRuntimeMarker(pid, dir) {
+  if (!Number.isInteger(pid) || pid <= 0) return null;
+  const path = join20(dir, `${pid}.json`);
+  try {
+    const parsed = JSON.parse(readFileSync2(path, "utf8"));
+    if (parsed && typeof parsed === "object" && typeof parsed.sessionId === "string" && parsed.sessionId.length > 0) {
+      return parsed;
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+async function resolveSideChannelSessionId(_opts, _deps) {
+  return void 0;
+}
+function resolveFromAncestorMarkers(startPid, claudeSessionsDir, runtimeSessionsDir, readPpid, pidStartedAt, maxDepth) {
+  let pid = startPid;
+  for (let depth = 0; depth < maxDepth; depth += 1) {
+    if (!Number.isInteger(pid) || pid <= 1) break;
+    for (const dir of [claudeSessionsDir, runtimeSessionsDir]) {
+      const marker = readRuntimeMarker(pid, dir);
+      if (!marker) continue;
+      if (marker.procStart) {
+        const actual = pidStartedAt(pid);
+        if (!actual || actual !== marker.procStart) continue;
+      }
+      if (isSafeSessionId(marker.sessionId)) return marker.sessionId;
+    }
+    const parent = readPpid(pid);
+    if (parent === null) break;
+    pid = parent;
+  }
+  return void 0;
+}
+async function resolveFromCwdScan(cwd, statMtimeMs) {
+  const candidates = [];
+  for await (const meta of walkClaudeProjects()) {
+    if (meta.cwd === cwd && isSafeSessionId(meta.sessionId)) {
+      candidates.push({ sessionId: meta.sessionId, mtime: statMtimeMs(meta.path) ?? 0 });
+    }
+  }
+  for await (const meta of walkCodexSessions()) {
+    if (meta.cwd === cwd && isSafeSessionId(meta.sessionId)) {
+      candidates.push({ sessionId: meta.sessionId, mtime: statMtimeMs(meta.path) ?? 0 });
+    }
+  }
+  if (candidates.length === 0) return void 0;
+  candidates.sort((a, b) => b.mtime - a.mtime || (a.sessionId < b.sessionId ? 1 : a.sessionId > b.sessionId ? -1 : 0));
+  return candidates[0].sessionId;
+}
+async function resolveOwnSessionId(opts = {}, deps = {}) {
+  if (isSafeSessionId(opts.sessionId)) return opts.sessionId;
+  const env = deps.env ?? process.env;
+  for (const key of SESSION_ID_ENV_VARS) {
+    const value = env[key];
+    if (isSafeSessionId(value)) return value;
+  }
+  const sideChannel = await resolveSideChannelSessionId(opts, deps);
+  if (sideChannel) return sideChannel;
+  const home2 = deps.homeDir ?? homedir13();
+  const claudeSessionsDir = deps.claudeSessionsDir ?? join20(home2, ".claude", "sessions");
+  const runtimeSessionsDir = deps.runtimeSessionsDir ?? join20(home2, ".syntaur", "runtime", "sessions");
+  const startPid = deps.startPid ?? process.ppid;
+  const fromMarker = resolveFromAncestorMarkers(
+    startPid,
+    claudeSessionsDir,
+    runtimeSessionsDir,
+    deps.readPpid ?? defaultReadPpid,
+    deps.pidStartedAt ?? captureProcessStartedAt,
+    deps.maxDepth ?? 12
+  );
+  if (fromMarker) return fromMarker;
+  if (opts.cwd) {
+    const fromScan = await resolveFromCwdScan(opts.cwd, deps.statMtimeMs ?? defaultStatMtimeMs);
+    if (fromScan) return fromScan;
+  }
+  if (isSafeSessionId(opts.legacyHint)) return opts.legacyHint;
+  return void 0;
+}
+
+// src/commands/session.ts
 async function readContext(cwd) {
   const path = resolve78(cwd, ".syntaur", "context.json");
   if (!await fileExists(path)) return null;
@@ -32607,7 +32727,11 @@ async function resolveSaveTarget(options, cwd) {
     assignmentDir = ctx.assignmentDir;
     slug = ctx.assignmentSlug ?? "";
   }
-  const sessionId = options.sessionId ?? ctx?.sessionId;
+  const sessionId = await resolveOwnSessionId({
+    sessionId: options.sessionId,
+    cwd,
+    legacyHint: ctx?.sessionId
+  });
   if (!sessionId) {
     throw new Error(
       "Session not tracked. Pass --session-id <id>, or run `syntaur track-session ...` first so context.json carries a real session id."
@@ -32693,7 +32817,7 @@ sessionCommand.command("resume").description(
     process.exit(1);
   }
 });
-sessionCommand.command("save").description("Write the session's continuity summary to sessions/<sessionId>/summary.md").option("--session-id <id>", "Session id (defaults to .syntaur/context.json sessionId)").option("--from-file <path>", "Read the summary body from a file (else stdin; else a skeleton)").option("--assignment <slug>", "Assignment slug (UUID for standalone). Defaults to .syntaur/context.json").option("--project <slug>", "Project slug. Required with --assignment for a project-nested assignment").action(async (options) => {
+sessionCommand.command("save").description("Write the session's continuity summary to sessions/<sessionId>/summary.md").option("--session-id <id>", "Session id (defaults to the resolved session: env / process tree, falling back to the .syntaur/context.json hint)").option("--from-file <path>", "Read the summary body from a file (else stdin; else a skeleton)").option("--assignment <slug>", "Assignment slug (UUID for standalone). Defaults to .syntaur/context.json").option("--project <slug>", "Project slug. Required with --assignment for a project-nested assignment").action(async (options) => {
   try {
     const path = await runSessionSave(options);
     console.log(`Saved session summary to ${path}`);
@@ -32702,6 +32826,18 @@ sessionCommand.command("save").description("Write the session's continuity summa
     process.exit(1);
   }
 });
+sessionCommand.command("resolve-id").description(
+  "Print the caller's own real session id, resolved from the process (env / process tree / transcript). Exits 1 if none can be resolved. Deliberately does NOT read the context.json scalar \u2014 for hooks that must attribute the exact ending session."
+).option("--cwd <path>", "Working directory for the transcript-scan fallback", process.cwd()).action(async (options) => {
+  try {
+    const id = await resolveOwnSessionId({ cwd: options.cwd ?? process.cwd() });
+    if (!id) process.exit(1);
+    console.log(id);
+  } catch (error) {
+    console.error("Error:", error instanceof Error ? error.message : String(error));
+    process.exit(1);
+  }
+});
 
 // src/commands/worktree.ts
 init_git_worktree();