slopwaresystems 0.9.4 → 0.9.5

package/dist/index.js

@@ -146,7 +146,7 @@ function fetchLaunchCandidate(launcher2) {
 var path = fileURLToPath(import.meta.url);
 var launcher = {
   path,
-  bundledVersion: "0.9.4",
+  bundledVersion: "0.9.5",
   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.4";
+var CLI_RELEASE = "0.9.5";
 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) {
@@ -28760,6 +28760,25 @@ function persistRememberedConversation(cwd, conversation) {
   const directory = `${buildConversationPath(cwd)}.d`;
   persistLocalState(join3(directory, `${generateLocalStateKey(cwd, conversation.id)}.json`), JSON.stringify(conversation));
 }
+var buildRelayConversationPath = (relay) => join3(buildSessionsDir(), `relay-${relay.relayPid}-${relay.harnessPid}.conversation.json`);
+function persistRelayConversation(relay, conversation) {
+  try {
+    persistLocalState(buildRelayConversationPath(relay), JSON.stringify(conversation));
+  } catch {
+  }
+}
+function fetchRelayConversation(relay) {
+  try {
+    const parsed = JSON.parse(readFileSync4(buildRelayConversationPath(relay), "utf8"));
+    const harness = AgentHarness.safeParse(parsed.harness);
+    return typeof parsed.id === "string" && parsed.id && harness.success ? { id: parsed.id, harness: harness.data } : null;
+  } catch {
+    return null;
+  }
+}
+function deleteRelayConversation(relay) {
+  rmSync4(buildRelayConversationPath(relay), { force: true });
+}
 function fetchRememberedConversation(cwd, notBefore, harness) {
   const path3 = buildConversationPath(cwd);
   const candidates = [];
@@ -29378,6 +29397,24 @@ function isMainChatThread(roots, threadId) {
   const head = fetchFileHead(path3, HEAD_BYTES);
   return head === "" ? true : isMainChatRollout(head.split("\n")[0] ?? "");
 }
+function parseCodexThreadFromToolCallMeta(meta3) {
+  const turn = meta3["x-codex-turn-metadata"];
+  if (typeof turn !== "object" || turn === null || Array.isArray(turn)) return null;
+  const thread = turn.thread_id ?? meta3.threadId;
+  return typeof thread === "string" && thread.trim() ? thread.trim() : null;
+}
+var PARENT_THREAD_HOPS = 8;
+function fetchCodexChatThreadId(roots, threadId) {
+  let current = threadId;
+  for (let hop = 0; hop < PARENT_THREAD_HOPS; hop += 1) {
+    const path3 = fetchCodexRolloutPath(roots, current);
+    const line = path3 ? fetchFileHead(path3, HEAD_BYTES).split("\n")[0] ?? "" : "";
+    const parent = /"parent_thread_id"\s*:\s*"([^"]+)"/.exec(line)?.[1];
+    if (!parent || parent === current) return current;
+    current = parent;
+  }
+  return current;
+}
 function fetchCodexRolloutPath(roots, threadId) {
   const suffix = `-${threadId}.jsonl`;
   let best = null;
@@ -29451,15 +29488,14 @@ function fetchKnownConversation(cwd) {
   if (remembered?.harness === "codex" && isMainChatThread(fetchCodexHomes().map((home) => join9(home, "sessions")), remembered.id)) return remembered;
   return remembered?.harness === "codex" ? null : remembered;
 }
-function resolveAgentIdentity(cwd, fallback = "process") {
-  const conversation = fetchKnownConversation(cwd);
+function resolveAgentIdentity(cwd, fallback = "process", conversation = fetchKnownConversation(cwd)) {
   const repo = fetchRepo();
   return {
     conversation: conversation?.id ?? (fallback === "process" ? processConversation : `dir:${resolve4(cwd)}`),
     harness: conversation?.harness ?? null,
     directory: repo ? basename3(repo.worktree) : basename3(cwd),
     branch: fetchCurrentBranch(cwd),
-    cliVersion: "0.9.4"
+    cliVersion: "0.9.5"
   };
 }
 
@@ -29924,6 +29960,9 @@ linked to ${link.projectKey}  ${link.projectName}  (${link.baseUrl})`
   });
 }
 
+// src/commands/mcp.ts
+import { join as join26 } from "path";
+
 // src/platform/mcp.ts
 import { createInterface } from "readline";
 
@@ -30008,6 +30047,7 @@ function buildMcpRequestHandler(tools, info, sendJsonRpcMessage, options2 = {})
         const output2 = new McpOutput();
         let text;
         try {
+          options2.onToolCall?.(isRecord(params._meta) ? params._meta : {});
           const suppliedArguments = params.arguments ?? {};
           const args2 = tool.parseInput ? tool.parseInput(suppliedArguments) : suppliedArguments;
           text = output2.formatResult(await tool.run(args2, output2));
@@ -30123,7 +30163,7 @@ function buildUpdateNotice() {
 }
 function resolveLatestCliVersion() {
   const deprecated = fetchDeprecatedVersions();
-  return sortCliVersions([CLI_RELEASE, "0.9.4", fetchUpdateStatus().latest ?? CLI_RELEASE]).filter((version2) => !deprecated.has(version2)).at(-1) ?? CLI_RELEASE;
+  return sortCliVersions([CLI_RELEASE, "0.9.5", 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";
@@ -30559,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.4"]));
+    deleteUnusedVersions(/* @__PURE__ */ new Set([running, previous, current, launcher.bundledVersion, "0.9.5"]));
     persistUpdateStatus({ checkedAt: now(), latest, failures: 0, lastError: null });
     return { action, running, previous, latest };
   } catch (error62) {
@@ -31366,7 +31406,7 @@ function watchLaunchTarget(onChange) {
 }
 function runMcpRelay() {
   const launcher = readLauncherInfo();
-  const own2 = { version: "0.9.4", main: fileURLToPath(import.meta.url), downloaded: false };
+  const own2 = { version: "0.9.5", main: fileURLToPath(import.meta.url), downloaded: false };
   const relay = new McpRelay({
     input: process.stdin,
     output: process.stdout,
@@ -31807,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.4" },
+      claim: () => options2.claim ?? { harness: null, directory: null, branch: null, cliVersion: "0.9.5" },
       reconnect: false,
       onHello: options2.onHello,
       onEnd: () => finishWait({ kind: "ended" }),
@@ -35445,7 +35485,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.4", 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.5", 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)) {
@@ -37479,17 +37519,17 @@ function hasHarnessSetup() {
 function syncMachineSetupAfterUpdate() {
   const nothing = { skills: [], retired: [], reinstalling: false };
   try {
-    if (!isUpdateCheckEnabled() || fetchMachineSetupState()?.version === "0.9.4") return nothing;
+    if (!isUpdateCheckEnabled() || fetchMachineSetupState()?.version === "0.9.5") return nothing;
     const lock = claimFileLock(buildMachineSetupLockDirectory(), { staleAfterMs: 6e4 });
     if (!lock) return nothing;
     try {
       const state = fetchMachineSetupState();
-      if (state?.version === "0.9.4") return nothing;
+      if (state?.version === "0.9.5") 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.4", setupRevision, skills: hasInstalledSkills() ? shipped : [] });
+      persistMachineSetupState({ version: "0.9.5", setupRevision, skills: hasInstalledSkills() ? shipped : [] });
       const reinstalling = setupRevision !== null && setupRevision < SETUP_REVISION && runMcpInstallInBackground();
       return { skills, retired, reinstalling };
     } finally {
@@ -37656,7 +37696,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.4" }, capabilities: { experimentalApi: true } });
+    await callCodexMethod("initialize", { clientInfo: { name: "slop", version: "0.9.5" }, 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 "));
@@ -37689,18 +37729,27 @@ function registerMcpInstallCommand(mcp) {
 }
 
 // src/commands/mcp.ts
-function buildTools(lifecycle) {
-  if (isNonInteractiveHarness()) return { tools: [], startPresence: () => void 0, releaseSessions: () => void 0 };
+function buildTools(lifecycle, relay) {
+  if (isNonInteractiveHarness()) return { tools: [], startPresence: () => void 0, releaseSessions: () => void 0, observeToolCall: () => void 0 };
   let api = null;
   const requireApi = () => api ??= buildAuthedApiClient();
   let identity = null;
+  let called = relay ? fetchRelayConversation(relay) : null;
+  const observeToolCall = (meta3) => {
+    if (called) return;
+    const thread = parseCodexThreadFromToolCallMeta(meta3);
+    if (!thread) return;
+    called = { id: fetchCodexChatThreadId(fetchCodexHomes().map((home) => join26(home, "sessions")), thread), harness: "codex" };
+    if (relay) persistRelayConversation(relay, called);
+  };
+  const fetchOwnConversation = () => called ?? fetchKnownConversation(process.cwd());
   let stopped = false;
   const projects = /* @__PURE__ */ new Map();
   const requireProjectTools = (project) => {
     if (stopped) throw new Error("The MCP server is stopping");
     let context2 = projects.get(project.id);
     if (!context2) {
-      identity ??= resolveAgentIdentity(process.cwd());
+      identity ??= resolveAgentIdentity(process.cwd(), "process", fetchOwnConversation());
       context2 = createProjectTools(buildAuthedApiClient(), project, identity);
       projects.set(project.id, context2);
     }
@@ -37719,8 +37768,9 @@ function buildTools(lifecycle) {
     if (presenceStarted) return;
     presenceStarted = true;
     void (async () => {
-      for (let waited = 0; waited < 1e4 && !fetchKnownConversation(process.cwd()) && !stopped; waited += 250) await new Promise((resolve6) => setTimeout(resolve6, 250));
+      for (let waited = 0; waited < 1e4 && !fetchOwnConversation() && !stopped; waited += 250) await new Promise((resolve6) => setTimeout(resolve6, 250));
       if (stopped) return;
+      if (!identity && !fetchOwnConversation() && resolveParentHarness() === "codex") return;
       await requireProjectTools(await resolveProject(requireApi())).start();
     })().catch(() => void 0);
   };
@@ -37728,6 +37778,7 @@ function buildTools(lifecycle) {
     if (stopped) return;
     stopped = true;
     for (const context2 of projects.values()) context2.stop(reason);
+    if (relay && reason === "released") deleteRelayConversation(relay);
   };
   let exiting = false;
   const endSessionAndExit = (reason) => {
@@ -37739,7 +37790,7 @@ function buildTools(lifecycle) {
   process.stdin.once("end", () => endSessionAndExit(lifecycle.onInputEnd));
   process.stdin.once("close", () => endSessionAndExit(lifecycle.onInputEnd));
   for (const signal of ["SIGTERM", "SIGHUP", "SIGINT"]) process.once(signal, () => endSessionAndExit("released"));
-  return { tools: createProjectGroupedTools(runHandlerByName), startPresence, releaseSessions };
+  return { tools: createProjectGroupedTools(runHandlerByName), startPresence, releaseSessions, observeToolCall };
 }
 function attachUpdateNoticeToTools(list) {
   return list.map((tool) => ({
@@ -37754,10 +37805,12 @@ ${notice}` : result;
   }));
 }
 function serveBoardTools(version2) {
-  const underRelay = drainRelayChildContextFromEnvironment() !== null;
+  const relay = drainRelayChildContextFromEnvironment();
+  const underRelay = relay !== null;
   const lifecycle = { onInputEnd: underRelay ? "orphaned" : "released" };
-  const { tools, startPresence, releaseSessions } = buildTools(lifecycle);
+  const { tools, startPresence, releaseSessions, observeToolCall } = buildTools(lifecycle, relay);
   serveMcp(attachUpdateNoticeToTools(tools), { name: "slop", version: version2 }, {
+    onToolCall: observeToolCall,
     onNotification: (method) => {
       if (method === RELAY_START_NOTIFICATION) startPresence();
       else if (method === RELAY_HANDOVER_NOTIFICATION) {
@@ -37921,7 +37974,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.4").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.5").option("--json", "machine-readable output: JSON on stdout, errors as JSON on stderr").configureOutput({
   outputError: (message, write) => {
     if (!isJsonMode()) write(message);
   },
@@ -37938,7 +37991,7 @@ var sessionCommand = registerSessionCommands(program2);
 registerThreadCommands(program2, taskCommand);
 registerOperationCommands(program2, taskCommand, sessionCommand);
 registerSplatCommands(program2);
-registerMcpCommands(program2, "0.9.4");
+registerMcpCommands(program2, "0.9.5");
 registerGuideCommand(program2);
 registerSkillCommands(program2);
 registerUpdateCommand(program2);

package/package.json

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