slopwaresystems 0.9.5 → 0.9.6

package/dist/index.js

@@ -146,7 +146,7 @@ function fetchLaunchCandidate(launcher2) {
 var path = fileURLToPath(import.meta.url);
 var launcher = {
   path,
-  bundledVersion: "0.9.5",
+  bundledVersion: "0.9.6",
   bundledMain: fileURLToPath(new URL("./main.js", import.meta.url)),
   installed: isInstalledLauncherPath(path)
 };

package/dist/main.js

@@ -26542,7 +26542,7 @@ var TaskEventRecord = external_exports.object({
 });
 
 // ../contract/src/work/cli-release.ts
-var CLI_RELEASE = "0.9.5";
+var CLI_RELEASE = "0.9.6";
 var CLI_VERSION_PATTERN = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/;
 var CLI_VERSION_MAX = 64;
 function parseCliVersion(version2) {
@@ -29495,7 +29495,7 @@ function resolveAgentIdentity(cwd, fallback = "process", conversation = fetchKno
     harness: conversation?.harness ?? null,
     directory: repo ? basename3(repo.worktree) : basename3(cwd),
     branch: fetchCurrentBranch(cwd),
-    cliVersion: "0.9.5"
+    cliVersion: "0.9.6"
   };
 }
 
@@ -30163,7 +30163,7 @@ function buildUpdateNotice() {
 }
 function resolveLatestCliVersion() {
   const deprecated = fetchDeprecatedVersions();
-  return sortCliVersions([CLI_RELEASE, "0.9.5", fetchUpdateStatus().latest ?? CLI_RELEASE]).filter((version2) => !deprecated.has(version2)).at(-1) ?? CLI_RELEASE;
+  return sortCliVersions([CLI_RELEASE, "0.9.6", fetchUpdateStatus().latest ?? CLI_RELEASE]).filter((version2) => !deprecated.has(version2)).at(-1) ?? CLI_RELEASE;
 }
 function formatAgentCliVersion(version2, latest = resolveLatestCliVersion()) {
   const label = version2 ? `slop ${version2}` : "an older slop";
@@ -30599,7 +30599,7 @@ async function updateInstalledCliFromRegistry(launcher, options2) {
     const running = fetchLaunchCandidate(launcher).version;
     const action = running === previous ? "current" : isNewerVersion(running, previous) ? "updated" : "rolled-back";
     const latest = resolveNewestOfferedRelease(index);
-    deleteUnusedVersions(/* @__PURE__ */ new Set([running, previous, current, launcher.bundledVersion, "0.9.5"]));
+    deleteUnusedVersions(/* @__PURE__ */ new Set([running, previous, current, launcher.bundledVersion, "0.9.6"]));
     persistUpdateStatus({ checkedAt: now(), latest, failures: 0, lastError: null });
     return { action, running, previous, latest };
   } catch (error62) {
@@ -31406,7 +31406,7 @@ function watchLaunchTarget(onChange) {
 }
 function runMcpRelay() {
   const launcher = readLauncherInfo();
-  const own2 = { version: "0.9.5", main: fileURLToPath(import.meta.url), downloaded: false };
+  const own2 = { version: "0.9.6", main: fileURLToPath(import.meta.url), downloaded: false };
   const relay = new McpRelay({
     input: process.stdin,
     output: process.stdout,
@@ -31847,7 +31847,7 @@ async function waitForMessage(api, projectId, taskKey, options2 = {}) {
       setTimeout(() => resolve6(outcome), 50);
     };
     const held = new HeldSession(api, projectId, taskKey, {
-      claim: () => options2.claim ?? { harness: null, directory: null, branch: null, cliVersion: "0.9.5" },
+      claim: () => options2.claim ?? { harness: null, directory: null, branch: null, cliVersion: "0.9.6" },
       reconnect: false,
       onHello: options2.onHello,
       onEnd: () => finishWait({ kind: "ended" }),
@@ -32158,7 +32158,6 @@ var WORKER_FRESH_MS = 12e4;
 var WORKER_GONE_MS = 3e5;
 var READ_CAP = 256 * 1024;
 var CARRY_CAP = 64 * 1024;
-var CHILD_SCAN_CAP = 40;
 var DISCOVER_EVERY_MS = 1e4;
 var TAIL_EVERY_MS = 1e3;
 var truncate = (text, cap) => text.length <= cap ? text : `${text.slice(0, cap - 1)}\u2026`;
@@ -32292,7 +32291,33 @@ function parseModelFromCodexLine(line) {
   if (entry.type !== "turn_context" || typeof model !== "string" || !model.trim()) return null;
   return truncate(model.trim(), MODEL_MAX);
 }
-var resolveLineParsers = (harness) => harness === "codex" ? { parseToolCall: parseToolCallFromCodexLine, parseModel: parseModelFromCodexLine } : { parseToolCall: parseToolCallFromClaudeLine, parseModel: parseModelFromClaudeLine };
+function parseTurnStateFromClaudeLine(line) {
+  if (!line.includes('"assistant"') && !line.includes('"user"')) return null;
+  let entry;
+  try {
+    entry = JSON.parse(line);
+  } catch {
+    return null;
+  }
+  if (entry.type === "user") return "working";
+  if (entry.type !== "assistant") return null;
+  const stop = entry.message?.stop_reason;
+  return stop === "end_turn" || stop === "stop_sequence" ? "finished" : "working";
+}
+function parseTurnStateFromCodexLine(line) {
+  if (!line.includes('"event_msg"') && !line.includes('"response_item"') && !line.includes('"turn_context"')) return null;
+  let entry;
+  try {
+    entry = JSON.parse(line);
+  } catch {
+    return null;
+  }
+  if (entry.type === "response_item" || entry.type === "turn_context") return "working";
+  if (entry.type !== "event_msg") return null;
+  if (entry.payload?.type === "task_complete" || entry.payload?.type === "turn_aborted") return "finished";
+  return entry.payload?.type === "task_started" ? "working" : null;
+}
+var resolveLineParsers = (harness) => harness === "codex" ? { parseToolCall: parseToolCallFromCodexLine, parseModel: parseModelFromCodexLine, parseTurnState: parseTurnStateFromCodexLine } : { parseToolCall: parseToolCallFromClaudeLine, parseModel: parseModelFromClaudeLine, parseTurnState: parseTurnStateFromClaudeLine };
 var fetchFileSize = (path3) => {
   try {
     return statSync7(path3).size;
@@ -32347,6 +32372,14 @@ function fetchModelFromFileTail(path3, parseModel) {
   }
   return null;
 }
+function fetchTurnStateFromFileTail(path3, parseTurnState) {
+  const lines2 = new FileTail(path3, "start").fetchNewLines();
+  for (let index = lines2.length - 1; index >= 0; index -= 1) {
+    const state = parseTurnState(lines2[index]);
+    if (state) return state;
+  }
+  return "working";
+}
 var fetchChangedAt = (path3) => {
   try {
     return statSync7(path3).mtimeMs;
@@ -32422,7 +32455,7 @@ function parseCodexWorkerLabel(head) {
   return parts.length ? truncate(parts.join(" \u2014 "), WORKER_LABEL_MAX) : null;
 }
 function findCodexChildRollouts(roots, parentThreadId, changedAfter) {
-  const rollouts = [];
+  const rollouts = /* @__PURE__ */ new Map();
   const findRolloutsInDirectory = (directory, depth) => {
     let entries;
     try {
@@ -32440,12 +32473,13 @@ function findCodexChildRollouts(roots, parentThreadId, changedAfter) {
       if (!ref || ref === parentThreadId) continue;
       const changedAt = fetchChangedAt(path3);
       if (changedAt < changedAfter) continue;
-      rollouts.push({ path: path3, ref, changedAt });
+      if (!rollouts.has(ref)) rollouts.set(ref, { path: path3, ref, changedAt });
     }
   };
   for (const root of roots) findRolloutsInDirectory(root, 0);
   const found = [];
-  for (const rollout of rollouts.sort((a, b) => b.changedAt - a.changedAt).slice(0, CHILD_SCAN_CAP)) {
+  for (const rollout of [...rollouts.values()].sort((a, b) => b.changedAt - a.changedAt)) {
+    if (found.length >= WORKERS_PER_SESSION) break;
     const head = fetchFileHead(rollout.path, HEAD_BYTES).split("\n")[0] ?? "";
     if (!head.includes('"session_meta"') || isCodexHelperRollout(head)) continue;
     if (!new RegExp(`"parent_thread_id"\\s*:\\s*"${parentThreadId}"`).test(head)) continue;
@@ -32537,7 +32571,10 @@ var HarnessActivity = class {
     for (const file2 of found) {
       const known = this.workers.get(file2.ref);
       if (known) Object.assign(known, { label: file2.label, directory: file2.directory, branch: file2.branch, changedAt: file2.changedAt });
-      else this.workers.set(file2.ref, { ...file2, since: new Date(file2.changedAt).toISOString(), model: fetchModelFromFileTail(file2.path, this.parsers.parseModel), doing: null, tail: new FileTail(file2.path, "end") });
+      else {
+        const tail = new FileTail(file2.path, "end");
+        this.workers.set(file2.ref, { ...file2, since: new Date(file2.changedAt).toISOString(), model: fetchModelFromFileTail(file2.path, this.parsers.parseModel), doing: null, finished: fetchTurnStateFromFileTail(file2.path, this.parsers.parseTurnState) === "finished", tail });
+      }
     }
     const live = new Set(found.map((file2) => file2.ref));
     for (const ref of [...this.workers.keys()]) if (!live.has(ref)) this.workers.delete(ref);
@@ -32562,35 +32599,39 @@ var HarnessActivity = class {
     }
     return [];
   }
-  /** The newest tool call and the newest model in everything that has been written since the last read. */
+  /** The newest tool call, model and turn state in everything that has been written since the last read. */
   read() {
-    const { parseToolCall, parseModel } = this.parsers;
-    const fetchNewestCallAndModel = (tail) => {
+    const { parseToolCall, parseModel, parseTurnState } = this.parsers;
+    const fetchNewestCallModelAndTurnState = (tail) => {
       let call = null;
       let model = null;
+      let turn = null;
       for (const line of tail.fetchNewLines()) {
         call = parseToolCall(line) ?? call;
         model = parseModel(line) ?? model;
+        turn = parseTurnState(line) ?? turn;
       }
-      return { call, model };
+      return { call, model, turn };
     };
     if (this.own) {
-      const { call, model } = fetchNewestCallAndModel(this.own);
+      const { call, model } = fetchNewestCallModelAndTurnState(this.own);
       this.doing = call ?? this.doing;
       this.model = model ?? this.model;
     }
     for (const worker of this.workers.values()) {
-      const { call, model } = fetchNewestCallAndModel(worker.tail);
+      const { call, model, turn } = fetchNewestCallModelAndTurnState(worker.tail);
       worker.doing = call ?? worker.doing;
       worker.model = model ?? worker.model;
+      if (turn) worker.finished = turn === "finished";
     }
   }
   /**
-   * Every worker, oldest first, so the roster changes only when one starts or finishes and never because one got
-   * busy. The contract's guard is far past what a harness runs; past it, the oldest are the ones listed.
+   * Every worker still working, oldest first, so the roster changes only when one starts or finishes and never
+   * because one got busy. One whose turn has ended leaves at once, not when its records have gone quiet. The
+   * contract's guard is far past what a harness runs; past it, the oldest are the ones listed.
    */
   buildRoster() {
-    return [...this.workers.values()].sort((a, b) => a.since.localeCompare(b.since) || a.ref.localeCompare(b.ref)).slice(0, WORKERS_PER_SESSION).map((worker) => ({ ref: worker.ref, label: worker.label, directory: worker.directory, branch: worker.branch, model: worker.model, since: worker.since }));
+    return [...this.workers.values()].filter((worker) => !worker.finished).sort((a, b) => a.since.localeCompare(b.since) || a.ref.localeCompare(b.ref)).slice(0, WORKERS_PER_SESSION).map((worker) => ({ ref: worker.ref, label: worker.label, directory: worker.directory, branch: worker.branch, model: worker.model, since: worker.since }));
   }
   /** Quiet for a while: still listed, because it is probably thinking, but saying nothing about what it is doing. */
   buildWorkerLines(roster, now) {
@@ -35485,7 +35526,7 @@ var SplatRendererConnection = class {
     try {
       let path3;
       try {
-        const ticket = await this.api.post(`/projects/${this.projectId}/splat/renderer/ticket`, ApiResponses.ConnectTicket, { cliVersion: "0.9.5", onlyMe: this.options.onlyMe ?? false, agent: this.options.agent ?? null, capabilities: ["workspaces"] });
+        const ticket = await this.api.post(`/projects/${this.projectId}/splat/renderer/ticket`, ApiResponses.ConnectTicket, { cliVersion: "0.9.6", onlyMe: this.options.onlyMe ?? false, agent: this.options.agent ?? null, capabilities: ["workspaces"] });
         path3 = ticket.path;
       } catch (error62) {
         if (error62 instanceof CliError && ["unauthenticated", "not_found", "forbidden", "bad_request"].includes(error62.code)) {
@@ -37519,17 +37560,17 @@ function hasHarnessSetup() {
 function syncMachineSetupAfterUpdate() {
   const nothing = { skills: [], retired: [], reinstalling: false };
   try {
-    if (!isUpdateCheckEnabled() || fetchMachineSetupState()?.version === "0.9.5") return nothing;
+    if (!isUpdateCheckEnabled() || fetchMachineSetupState()?.version === "0.9.6") return nothing;
     const lock = claimFileLock(buildMachineSetupLockDirectory(), { staleAfterMs: 6e4 });
     if (!lock) return nothing;
     try {
       const state = fetchMachineSetupState();
-      if (state?.version === "0.9.5") return nothing;
+      if (state?.version === "0.9.6") return nothing;
       const skills = hasInstalledSkills() ? installSkills() : [];
       const shipped = Object.keys(SKILLS);
       const retired = deleteRetiredSkills((state?.skills ?? []).filter((name) => !shipped.includes(name)));
       const setupRevision = state?.setupRevision ?? (hasHarnessSetup() ? UNRECORDED_SETUP_REVISION : null);
-      persistMachineSetupState({ version: "0.9.5", setupRevision, skills: hasInstalledSkills() ? shipped : [] });
+      persistMachineSetupState({ version: "0.9.6", setupRevision, skills: hasInstalledSkills() ? shipped : [] });
       const reinstalling = setupRevision !== null && setupRevision < SETUP_REVISION && runMcpInstallInBackground();
       return { skills, retired, reinstalling };
     } finally {
@@ -37696,7 +37737,7 @@ async function trustCodexHooks(codexHome) {
   const sendNotification = (method, params) => server.stdin.write(`${JSON.stringify({ jsonrpc: "2.0", method, params })}
 `);
   try {
-    await callCodexMethod("initialize", { clientInfo: { name: "slop", version: "0.9.5" }, capabilities: { experimentalApi: true } });
+    await callCodexMethod("initialize", { clientInfo: { name: "slop", version: "0.9.6" }, capabilities: { experimentalApi: true } });
     sendNotification("initialized", {});
     const listed = await callCodexMethod("hooks/list", { cwds: [process.cwd()] });
     const ours = listed.data.flatMap((entry) => entry.hooks).filter((hook) => hook.command?.startsWith("slop hook "));
@@ -37749,7 +37790,14 @@ function buildTools(lifecycle, relay) {
     if (stopped) throw new Error("The MCP server is stopping");
     let context2 = projects.get(project.id);
     if (!context2) {
-      identity ??= resolveAgentIdentity(process.cwd(), "process", fetchOwnConversation());
+      if (!identity) {
+        const conversation = fetchOwnConversation();
+        identity = resolveAgentIdentity(process.cwd(), "process", conversation);
+        if (relay && conversation && !called) {
+          called = conversation;
+          persistRelayConversation(relay, conversation);
+        }
+      }
       context2 = createProjectTools(buildAuthedApiClient(), project, identity);
       projects.set(project.id, context2);
     }
@@ -37974,7 +38022,7 @@ var options = optionEnd < 0 ? args : args.slice(0, optionEnd);
 updateJsonMode(options.includes("--json"));
 syncMachineSetupAfterUpdate();
 if (!options.includes("--background") && !options.includes("--child")) scheduleBackgroundUpdate();
-var program2 = new Command().name("slop").description("Slopware Tasks from the terminal. Everything a person can do on the board, an agent can do here.").version("0.9.5").option("--json", "machine-readable output: JSON on stdout, errors as JSON on stderr").configureOutput({
+var program2 = new Command().name("slop").description("Slopware Tasks from the terminal. Everything a person can do on the board, an agent can do here.").version("0.9.6").option("--json", "machine-readable output: JSON on stdout, errors as JSON on stderr").configureOutput({
   outputError: (message, write) => {
     if (!isJsonMode()) write(message);
   },
@@ -37991,7 +38039,7 @@ var sessionCommand = registerSessionCommands(program2);
 registerThreadCommands(program2, taskCommand);
 registerOperationCommands(program2, taskCommand, sessionCommand);
 registerSplatCommands(program2);
-registerMcpCommands(program2, "0.9.5");
+registerMcpCommands(program2, "0.9.6");
 registerGuideCommand(program2);
 registerSkillCommands(program2);
 registerUpdateCommand(program2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "slopwaresystems",
-  "version": "0.9.5",
+  "version": "0.9.6",
   "private": false,
   "description": "slop: the Slopware Tasks board from the terminal, for people and coding agents.",
   "type": "module",