@staff0rd/assist 0.536.0 → 0.538.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.536.0",
+  version: "0.538.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -22601,7 +22601,8 @@ function requestClaudeSession(prompt, cwd, options2) {
     type: "create",
     prompt,
     cwd,
-    inPlace: options2?.inPlace === true
+    inPlace: options2?.inPlace === true,
+    launchedFrom: options2?.launchedFrom ?? process.env.ASSIST_SESSION_ID
   });
 }
 
@@ -30632,7 +30633,7 @@ function createSession(id, prompt, cwd, design, harness, holdPty) {
     design
   };
 }
-function createRunSession(id, { runName, runArgs, cwd, meta, launchedFrom }) {
+function createRunSession(id, { runName, runArgs, cwd, meta }) {
   const serverMeta = meta ?? serverRunMeta(runName, cwd);
   return {
     ...sessionBase(id, "running"),
@@ -30642,7 +30643,6 @@ function createRunSession(id, { runName, runArgs, cwd, meta, launchedFrom }) {
     runName,
     runArgs,
     cwd,
-    launchedFrom,
     server: serverMeta.server || void 0,
     serverPort: serverMeta.port,
     serverOrigin: serverMeta.origin
@@ -32033,7 +32033,8 @@ function wireSessionWatchers(session, notify2, onStatusChange) {
 }
 
 // src/commands/sessions/daemon/registerSpawnedSession.ts
-function registerSpawnedSession(session, sessions, clients, onStatusChange, notify2) {
+function registerSpawnedSession(session, sessions, clients, onStatusChange, notify2, context) {
+  if (context?.launchedFrom) session.launchedFrom = context.launchedFrom;
   sessions.set(session.id, session);
   wirePtyEvents(session, clients, onStatusChange);
   notify2();
@@ -32076,12 +32077,13 @@ var sessionLimits = {
 
 // src/commands/sessions/daemon/makeSessionSpawner.ts
 function makeSessionSpawner(sessions, clients, counter, onStatusChange, notify2) {
-  const register = (allocateId) => (create) => registerSpawnedSession(
+  const register = (allocateId) => (create, context) => registerSpawnedSession(
     create(allocateId()),
     sessions,
     clients,
     onStatusChange(),
-    notify2
+    notify2,
+    context
   );
   return {
     spawn: register(() => sessionLimits.nextId(sessions.size, counter)),
@@ -33241,6 +33243,7 @@ function resetCardForRun(session, assistArgs) {
   session.usageSeeded = false;
   setStatus2(session, "running");
   session.restored = void 0;
+  session.launchedFrom = void 0;
 }
 
 // src/commands/sessions/daemon/startReusedRunPty.ts
@@ -33321,16 +33324,19 @@ function releaseReason(durability, session) {
 }
 
 // src/commands/sessions/daemon/worktree/allocateAndBind.ts
-function allocateAndBind(ctx, cwd, create, options2 = {}) {
+function allocateAndBind(ctx, cwd, create, options2 = {}, context) {
   const alloc = allocateTree(cwd, boundTreeRoots(ctx.sessions), options2);
   const needsSeeding = alloc.kind === "worktree" && alloc.created === true;
-  const id = ctx.spawnWith((sid) => create(sid, alloc.cwd, needsSeeding));
+  const id = ctx.spawnWith(
+    (sid) => create(sid, alloc.cwd, needsSeeding),
+    context
+  );
   bindNewWorktree(ctx.sessions.get(id), alloc, ctx.notify, ctx.startHeld);
   return id;
 }
 
 // src/commands/sessions/daemon/worktree/ensureWatcher.ts
-function ensureWatcher(ctx, cwd) {
+function ensureWatcher(ctx, cwd, launchedFrom) {
   if (!cwd) return void 0;
   const repoRoot2 = findRepoRoot(cwd) ?? cwd;
   const cfg = worktreeConfigFor(repoRoot2);
@@ -33347,7 +33353,8 @@ function ensureWatcher(ctx, cwd) {
     ctx,
     clone,
     (sid, resolvedCwd) => createWatcherSession(sid, resolvedCwd ?? clone),
-    { inPlace: true }
+    { inPlace: true },
+    { launchedFrom }
   );
   daemonLog(
     `spawned watcher session ${id} running /watch in the clone ${clone}`
@@ -33441,7 +33448,7 @@ function reuseSessionForRun(session, itemId2, clients, onStatusChange, tree) {
     onStatusChange
   );
   if (!started) return;
-  if (tree) ensureWatcher(tree, originCwd);
+  if (tree) ensureWatcher(tree, originCwd, session.id);
   attachReusedRun(session, alloc, clients, onStatusChange, tree);
   daemonLog(
     `session ${session.id} reused for backlog run ${itemId2}: ${session.name}`
@@ -33764,7 +33771,7 @@ async function forwardWindowsCreate(conn, state, client, data) {
 }
 function stripOutboundSessionId(data) {
   const stripped = { ...data };
-  for (const key of ["sessionId", "joinSessionId"])
+  for (const key of ["sessionId", "joinSessionId", "launchedFrom"])
     if (typeof stripped[key] === "string")
       stripped[key] = stripWindowsSessionId(stripped[key]);
   return stripped;
@@ -34237,7 +34244,8 @@ function joinableStream(sessions, targetId) {
 function spawnIntoStream(ctx, target, prompt, harness) {
   const holdUntilSeeded = target.pendingStart !== void 0;
   const id = ctx.spawnWith(
-    (sid) => createSession(sid, prompt, target.cwd, false, harness, holdUntilSeeded)
+    (sid) => createSession(sid, prompt, target.cwd, false, harness, holdUntilSeeded),
+    { launchedFrom: target.id }
   );
   const joined = ctx.sessions.get(id);
   if (joined && target.worktree) joined.worktree = { ...target.worktree };
@@ -34283,8 +34291,7 @@ function createAssistSession(id, assistArgs, cwd, meta, holdPty) {
     ),
     scrollback: "",
     assistArgs,
-    cwd,
-    launchedFrom: meta?.launchedFrom
+    cwd
   };
 }
 
@@ -34380,15 +34387,16 @@ function cloneForReapedTree(missingCwd) {
 }
 
 // src/commands/sessions/daemon/worktree/spawnInTree.ts
-function spawnInTree(ctx, prompt, cwd, design, harness, inPlace) {
+function spawnInTree(ctx, { prompt, cwd, design, harness, inPlace }, context) {
   return allocateAndBind(
     ctx,
     cwd,
     (sid, resolvedCwd, holdUntilSeeded) => createSession(sid, prompt, resolvedCwd, design, harness, holdUntilSeeded),
-    { inPlace }
+    { inPlace },
+    context
   );
 }
-function spawnAssistInTree(ctx, assistArgs, cwd, meta) {
+function spawnAssistInTree(ctx, assistArgs, cwd, meta, context) {
   const id = allocateAndBind(
     ctx,
     cwd,
@@ -34398,9 +34406,10 @@ function spawnAssistInTree(ctx, assistArgs, cwd, meta) {
       commits: isCommittingArgs(assistArgs),
       draftLike: isDraftCommand(assistArgs[0]),
       inPlace: meta?.inPlace
-    }
+    },
+    context
   );
-  if (isBacklogRunArgs(assistArgs)) ensureWatcher(ctx, cwd);
+  if (isBacklogRunArgs(assistArgs)) ensureWatcher(ctx, cwd, id);
   return id;
 }
 function resumeInTree(ctx, sessionId, cwd, name) {
@@ -34530,20 +34539,20 @@ var SessionManager = class {
       this.onStatusChange
     );
   }
-  spawn(prompt, cwd, design, harness, inPlace) {
-    return spawnInTree(this.treeCtx(), prompt, cwd, design, harness, inPlace);
+  spawn(request = {}, context) {
+    return spawnInTree(this.treeCtx(), request, context);
   }
   addAgent(targetId, prompt, harness) {
     return addAgentToStream(this.treeCtx(), targetId, prompt, harness);
   }
-  spawnRun(request) {
-    return this.spawnWith((id) => createRunSession(id, request));
+  spawnRun(request, context) {
+    return this.spawnWith((id) => createRunSession(id, request), context);
   }
   liveServerRun(origin, excludeId) {
     return liveServerRun(this.sessions, origin, excludeId);
   }
-  spawnAssist(assistArgs, cwd, meta) {
-    return spawnAssistInTree(this.treeCtx(), assistArgs, cwd, meta);
+  spawnAssist(assistArgs, cwd, meta, context) {
+    return spawnAssistInTree(this.treeCtx(), assistArgs, cwd, meta, context);
   }
   resume(sessionId, cwd, name) {
     return resumeInTree(this.treeCtx(), sessionId, cwd, name);
@@ -34644,13 +34653,20 @@ function creator(isNew, spawn13) {
   };
 }
 
+// src/commands/sessions/daemon/spawnContextFrom.ts
+function spawnContextFrom(d) {
+  return {
+    launchedFrom: d.launchedFrom ?? d.joinSessionId
+  };
+}
+
 // src/commands/sessions/daemon/handleCreateRun.ts
 function handleCreateRun(client, m, d) {
   if (m.windowsProxy.route(client, d)) return;
   const runName = d.runName;
   const cwd = d.cwd;
   const runArgs = d.runArgs ?? [];
-  const launchedFrom = d.launchedFrom;
+  const context = spawnContextFrom(d);
   const meta = serverRunMeta(runName, cwd);
   if (meta.server && meta.origin) {
     const existing = m.liveServerRun(meta.origin);
@@ -34662,7 +34678,7 @@ function handleCreateRun(client, m, d) {
         type: "run-conflict",
         runName,
         cwd,
-        launchedFrom,
+        launchedFrom: context.launchedFrom,
         existing: serverConflictInfo(existing)
       });
       return;
@@ -34676,7 +34692,7 @@ function handleCreateRun(client, m, d) {
   }
   sendTo(client, {
     type: "created",
-    sessionId: m.spawnRun({ runName, runArgs, cwd, meta, launchedFrom }),
+    sessionId: m.spawnRun({ runName, runArgs, cwd, meta }, context),
     isNew: true
   });
 }
@@ -34795,11 +34811,14 @@ function spawnCreate(m, d) {
     );
   }
   return m.spawn(
-    prompt,
-    d.cwd,
-    design,
-    harness,
-    d.inPlace === true
+    {
+      prompt,
+      cwd: d.cwd,
+      design,
+      harness,
+      inPlace: d.inPlace === true
+    },
+    spawnContextFrom(d)
   );
 }
 
@@ -34823,9 +34842,9 @@ var messageHandlers = {
       {
         title: d.title,
         subtitle: d.subtitle,
-        inPlace: d.inPlace === true,
-        launchedFrom: d.launchedFrom
-      }
+        inPlace: d.inPlace === true
+      },
+      spawnContextFrom(d)
     )
   ),
   resume: creator(

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.536.0",
+	"version": "0.538.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {