@moxxy/cli 0.14.4 → 0.14.5

package/dist/bin.js

@@ -2,7 +2,7 @@
 import { createRequire } from 'node:module';
 import { z as z$1, createMutex, defineTunnelProvider, definePlugin, defineProvider, defineTool, MoxxyError, asTurnId, defineMode, asPluginId, defineCommand, defineChannel, defineWorkflowExecutor, toFriendlyError, estimateTextTokens, classifyHttpStatus, createStuckLoopDetector, runCompactionIfNeeded, runElisionIfNeeded, collectProviderStream, usageEventFields, isContextOverflowError, emitRequestsAndDetectStuck, executeToolUses, buildSystemPromptWithSkills, projectMessages, defineCompactor, defineCacheStrategy, denyByDefaultResolver, createAllowListResolver, zodToJsonSchema, fileDiffSummary, runSingleShotTurn, defineSurface, runManualCompaction, isFileDiffDisplay, renderFrontmatter, defineEmbedder, migrateModeName, skillFrontmatterSchema, asSkillId, startChannelWith, parseFrontmatterFile, createDeferredPermissionResolver, getInstallHint, defineTranscriber, summarizeTokensByModel, countNodes, moxxyPackageSchema, encodeLoginPrompt, classifyNetworkError, addModelTotals, createJsonFileStore, ISOLATION_RANK, MOXXY_PCM16_24KHZ_MIME, fileDiffVerb, parseFrontmatter, createCallbackResolver, autoAllowResolver, asSessionId, asToolCallId, defineViewRenderer, DEFAULT_VIEW_TAGS, isSafeViewUrl, evaluateToolRule, summarizeSessionTokensFromEvents, toDiffRows, diffGutterNo, computeElisionState, toolResultStubbed, toolResultStub, toolResultBytes, conversationalStubbed, conversationalStub, asEventId } from '@moxxy/sdk';
 import * as fs32 from 'fs';
-import fs32__default, { existsSync, promises, ReadStream, mkdirSync, rmSync, statSync, readdirSync, writeFileSync, readFileSync, unlinkSync, chmodSync, watch, createReadStream } from 'fs';
+import fs32__default, { existsSync, promises, ReadStream, mkdirSync, writeFileSync, rmSync, statSync, readdirSync, readFileSync, unlinkSync, chmodSync, watch, createReadStream } from 'fs';
 import * as path3 from 'path';
 import path3__default, { join, dirname, resolve, relative, isAbsolute, basename } from 'path';
 import { isCliTunnelAvailable, writeFileAtomic, spawnCliTunnel, moxxyPath, moxxyHome, bearerTokenMatches, resolveChannelToken, rotateChannelToken, readRequestBody, MOXXY_WS_SUBPROTOCOL, bearerGuard, tokenFromWsProtocolHeader, writeFileAtomicSync } from '@moxxy/sdk/server';
@@ -81553,10 +81553,10 @@ var init_output = __esm({
           transformers
         });
       }
-      clip(clip) {
+      clip(clip2) {
         this.operations.push({
           type: "clip",
-          clip
+          clip: clip2
         });
       }
       unclip() {
@@ -81590,40 +81590,40 @@ var init_output = __esm({
             const { text, transformers } = operation;
             let { x: x4, y: y2 } = operation;
             let lines = text.split("\n");
-            const clip = clips.at(-1);
-            if (clip) {
-              const clipHorizontally = typeof clip?.x1 === "number" && typeof clip?.x2 === "number";
-              const clipVertically = typeof clip?.y1 === "number" && typeof clip?.y2 === "number";
+            const clip2 = clips.at(-1);
+            if (clip2) {
+              const clipHorizontally = typeof clip2?.x1 === "number" && typeof clip2?.x2 === "number";
+              const clipVertically = typeof clip2?.y1 === "number" && typeof clip2?.y2 === "number";
               if (clipHorizontally) {
                 const width = widestLine(text);
-                if (x4 + width < clip.x1 || x4 > clip.x2) {
+                if (x4 + width < clip2.x1 || x4 > clip2.x2) {
                   continue;
                 }
               }
               if (clipVertically) {
                 const height = lines.length;
-                if (y2 + height < clip.y1 || y2 > clip.y2) {
+                if (y2 + height < clip2.y1 || y2 > clip2.y2) {
                   continue;
                 }
               }
               if (clipHorizontally) {
                 lines = lines.map((line) => {
-                  const from = x4 < clip.x1 ? clip.x1 - x4 : 0;
+                  const from = x4 < clip2.x1 ? clip2.x1 - x4 : 0;
                   const width = stringWidth(line);
-                  const to = x4 + width > clip.x2 ? clip.x2 - x4 : width;
+                  const to = x4 + width > clip2.x2 ? clip2.x2 - x4 : width;
                   return sliceAnsi2(line, from, to);
                 });
-                if (x4 < clip.x1) {
-                  x4 = clip.x1;
+                if (x4 < clip2.x1) {
+                  x4 = clip2.x1;
                 }
               }
               if (clipVertically) {
-                const from = y2 < clip.y1 ? clip.y1 - y2 : 0;
+                const from = y2 < clip2.y1 ? clip2.y1 - y2 : 0;
                 const height = lines.length;
-                const to = y2 + height > clip.y2 ? clip.y2 - y2 : height;
+                const to = y2 + height > clip2.y2 ? clip2.y2 - y2 : height;
                 lines = lines.slice(from, to);
-                if (y2 < clip.y1) {
-                  y2 = clip.y1;
+                if (y2 < clip2.y1) {
+                  y2 = clip2.y1;
                 }
               }
             }
@@ -136051,6 +136051,7 @@ var ARCHITECT_AGENT_ID = "architect";
 var COLLAB_SCAFFOLD_DIR = ".moxxy-collab";
 var CONTRACTS_FILENAME = "CONTRACTS.md";
 var ROSTER_FILENAME = "roster.json";
+var BRIEF_FILENAME = "BRIEF.md";
 function collabRunId(sessionId, turnId) {
   const tail = (s2) => s2.replace(/[^a-zA-Z0-9]/g, "").slice(-6) || "x";
   return `${tail(sessionId)}-${tail(turnId)}`;
@@ -139100,6 +139101,53 @@ function resolveCollabConfig(persisted, overrides) {
 function stripUndefined(obj) {
   return Object.fromEntries(Object.entries(obj).filter(([, v3]) => v3 !== void 0));
 }
+var MAX_MSG_CHARS = 600;
+var MAX_TOTAL_CHARS = 6e3;
+function clip(s2, n2) {
+  const t2 = s2.trim().replace(/\s+/g, " ");
+  return t2.length > n2 ? `${t2.slice(0, n2 - 1)}\u2026` : t2;
+}
+function digestTurns(events) {
+  const out = [];
+  for (const raw of events) {
+    const e3 = raw;
+    if (e3.type === "user_prompt" && typeof e3.text === "string" && e3.text.trim()) {
+      out.push({ role: "user", text: e3.text });
+    } else if (e3.type === "assistant_message" && e3.source === "model" && typeof e3.content === "string" && e3.content.trim()) {
+      out.push({ role: "assistant", text: e3.content });
+    }
+  }
+  return out;
+}
+function buildBrief(task, events) {
+  const turns = digestTurns(events);
+  const trimmed = turns.length > 0 && turns[turns.length - 1].role === "user" && turns[turns.length - 1].text.trim() === task.trim() ? turns.slice(0, -1) : turns;
+  const recent = trimmed.slice(-12);
+  const lines = [
+    "# Collaboration brief",
+    "",
+    "This is the shared context for the whole team. It is the user's goal and the",
+    "conversation that led to it \u2014 read it before planning so your work fits the",
+    "real intent, not just your narrow sub-task.",
+    "",
+    "## Goal",
+    "",
+    clip(task, 1500) || "(no goal text)"
+  ];
+  if (recent.length > 0) {
+    lines.push("", "## Conversation so far", "");
+    for (const t2 of recent) {
+      const who = t2.role === "user" ? "User" : "Assistant";
+      lines.push(`- **${who}:** ${clip(t2.text, MAX_MSG_CHARS)}`);
+    }
+  }
+  let brief = lines.join("\n");
+  if (brief.length > MAX_TOTAL_CHARS) {
+    brief = `${brief.slice(0, MAX_TOTAL_CHARS - 1)}\u2026`;
+  }
+  return `${brief}
+`;
+}
 var IDENTITY = ["-c", "user.name=moxxy-collab", "-c", "user.email=collab@moxxy.local"];
 function git(cwd2, args) {
   return new Promise((resolve13) => {
@@ -139522,6 +139570,12 @@ async function* runCollaborative(ctx, deps) {
     };
     supervisor = (deps.createSupervisor ?? ((o2) => new PeerSupervisor(o2)))(supervisorOpts, hub);
     yield await ctx.emit(plugin4(ctx, "collab_started", { task, parallel, gitInstalled: gitInstalled2, gitRepo }));
+    try {
+      mkdirSync(join(cwd2, COLLAB_SCAFFOLD_DIR), { recursive: true });
+      writeFileSync(join(cwd2, COLLAB_SCAFFOLD_DIR, BRIEF_FILENAME), buildBrief(task, ctx.log.slice()));
+      yield await ctx.emit(plugin4(ctx, "collab_brief_written", { path: join(COLLAB_SCAFFOLD_DIR, BRIEF_FILENAME) }));
+    } catch {
+    }
     supervisor.spawn({ entry: architectEntry, cwd: cwd2, mode: COLLAB_ARCHITECT_MODE_NAME });
     yield await ctx.emit(plugin4(ctx, "collab_agent_spawned", { id: ARCHITECT_AGENT_ID, role: "architect" }));
     const architectOk = await waitForAgent(hub, supervisor, ARCHITECT_AGENT_ID, ctx.signal, cfg.wallClockMs);
@@ -139813,7 +139867,11 @@ function emitAbort(ctx, reason) {
 }
 
 // ../mode-collaborative/dist/prompts.js
-var COLLAB_COMMON = `You are one agent on a TEAM of separate agents collaborating on one task in a shared codebase. You are a peer, not in charge \u2014 you cooperate.
+var COLLAB_COMMON = `You are one agent on a TEAM of separate agents collaborating on one task in a shared workspace. You are a peer, not in charge \u2014 you cooperate.
+
+Know the WHOLE picture before you act:
+- ${COLLAB_SCAFFOLD_DIR}/${BRIEF_FILENAME} is the shared brief \u2014 the user's overall goal and the conversation/intent behind it. Read it FIRST so your work serves the real goal, not just the literal words of your sub-task.
+- Before planning, recall() any relevant prior knowledge about this workspace/task. When you discover a durable fact (a decision, a gotcha, an interface, a convention), memory_save it so the team \u2014 and future work \u2014 keeps it.
 
 The team coordinates through a shared hub (use these tools):
 - collab_roster \u2014 who is on the team, their roles, sub-tasks, and status.
@@ -139832,11 +139890,12 @@ Cooperation rules:
 - When YOUR sub-task is fully complete and verified, call collab_done with a short summary. The run finishes when everyone is done.`;
 var COLLAB_PEER_PROMPT = `${COLLAB_COMMON}
 
-You are an IMPLEMENTER. Your sub-task is provided. Start by reading ${COLLAB_SCAFFOLD_DIR}/${CONTRACTS_FILENAME} and calling collab_contracts, collab_roster, and collab_board so you know the plan and who owns what. Claim your files, implement against the contracts, coordinate on intersections, then call collab_done.`;
+You are an IMPLEMENTER. Your sub-task is provided. Start by reading ${COLLAB_SCAFFOLD_DIR}/${BRIEF_FILENAME} (the goal + intent) and ${COLLAB_SCAFFOLD_DIR}/${CONTRACTS_FILENAME}, and calling collab_contracts, collab_roster, and collab_board so you know the plan and who owns what. Claim your files, implement against the contracts, coordinate on intersections, then call collab_done.`;
 var COLLAB_ARCHITECT_PROMPT = `${COLLAB_COMMON}
 
 You are the ARCHITECT \u2014 you run FIRST and set the team up for success. Your job, in order:
-1. Explore the codebase to understand the task and its boundaries.
+0. Read ${COLLAB_SCAFFOLD_DIR}/${BRIEF_FILENAME} \u2014 the user's goal and the conversation behind it \u2014 so you decompose toward what they actually want.
+1. Explore the workspace to understand the task and its boundaries.
 2. Decompose the task into INDEPENDENT sub-tasks with DISJOINT file ownership (minimize overlap so agents rarely touch the same files).
 3. Define the shared CONTRACTS \u2014 the interfaces, types, API shapes, and module boundaries where the implementers' work meets. Publish each with collab_contract_publish (give an owner + consumers).
 4. Write two files into the repo:
@@ -155948,7 +156007,10 @@ async function runAgentCommand(argv) {
   const sessionId = process.env.MOXXY_SESSION_ID?.trim();
   const mode = process.env.MOXXY_MODE?.trim() || "collab-peer";
   const subtask = process.env.MOXXY_COLLAB_SUBTASK ?? "";
+  const parentTask = process.env.MOXXY_COLLAB_PARENT_TASK?.trim() ?? "";
+  const role = process.env.MOXXY_COLLAB_ROLE?.trim() ?? "";
   const model = process.env.MOXXY_MODEL?.trim();
+  const seededTurn = buildSeedTurn({ role, parentTask, subtask });
   const setup = await bootSessionWithConfig(argv, {
     skipKeyPrompt: true,
     tolerateNoProvider: true,
@@ -155970,7 +156032,7 @@ async function runAgentCommand(argv) {
   const runnerServer = await startRunnerServer(session);
   const turnDone = (async () => {
     try {
-      for await (const _2 of session.runTurn(subtask)) void _2;
+      for await (const _2 of session.runTurn(seededTurn)) void _2;
     } catch {
     }
     try {
@@ -155987,6 +156049,20 @@ async function runAgentCommand(argv) {
   await runUntilSignal2(runnerServer, session, turnDone);
   return 0;
 }
+function buildSeedTurn(args) {
+  const { role, parentTask, subtask } = args;
+  const pointer = "Shared team context is in `.moxxy-collab/BRIEF.md` (the user's overall goal + the conversation/intent) and `.moxxy-collab/CONTRACTS.md` (the agreed interfaces). Read them before you start so your work fits the real goal.";
+  if (role === "architect" || !parentTask || parentTask === subtask) {
+    return subtask ? `${subtask}
+
+${pointer}` : pointer;
+  }
+  return `Overall team goal: ${parentTask}
+
+Your sub-task: ${subtask}
+
+${pointer}`;
+}
 async function runUntilSignal2(runnerServer, session, turnDone) {
   let stopping = false;
   const shutdown = async (signal) => {