nolo-cli 0.1.40 → 0.1.42

package/cli/client/agentRun.ts

@@ -1,34 +1,31 @@
-import { join } from "node:path";
 import { runLocalAgentTurn } from "../agentRuntimeLocal";
 import { LOCAL_AGENT_CONFIG_MISSING_CODE } from "../../agent-runtime/localLoop";
 import {
   MIMO_MONTH_AGENT_KEY,
   NOLO_PROJECT_MANAGER_AGENT_KEY,
-  NOLO_SENIOR_FULLSTACK_AGENT_KEY,
   WIN_CODEX_AGENT_KEY,
 } from "../agentAliases";
 import type { LocalAgentToolEvent } from "../../agent-runtime/localLoop";
 import type { AgentRuntimeHostAdapter, AgentRuntimeRequestedMode } from "../agentRuntimeLocal";
 import { createCliLocalRuntimeAdapter, isBuiltinNoloAgentRef } from "./localRuntimeAdapter";
 import { createStreamingTextWriter } from "./streamingOutput";
-import { prependTaskRunPrompt, type TaskRunPromptContext } from "./taskRunPrompt";
 
 type EnvLike = Record<string, string | undefined>;
 
 type OutputLike = {
   write(chunk: string): unknown;
 };
+type AgentRunSubjectRef = {
+  kind: string;
+  id: string;
+  role?: string;
+};
 
-type TaskRunAgentRole = "pm" | "frontend" | "fullstack" | "reviewer" | "codex";
-type TaskRunReviewStatus = "passed" | "needs_changes" | "blocked";
-type TaskRunToolEvidence = {
-  toolsUsed: string[];
-  summary: {
-    callCount: number;
-    resultCount: number;
-    errorCount: number;
-    rounds: number;
-  };
+type TaskContextReviewStatus = "passed" | "needs_changes" | "blocked";
+
+export type TaskRowContext = {
+  rowDbKey: string;
+  artifactIds?: string[];
 };
 
 type RunAgentTurnOptions = {
@@ -42,6 +39,8 @@ type RunAgentTurnOptions = {
   category?: string;
   inheritedFromDialogKey?: string;
   parentDialogId?: string;
+  subjectDialogKey?: string;
+  subjectRefs?: AgentRunSubjectRef[];
   background?: boolean;
   noStream?: boolean;
   scriptDir: string;
@@ -54,15 +53,7 @@ type RunAgentTurnOptions = {
   timeoutMs?: number;
   traceTools?: boolean;
   eventsMode?: "jsonl";
-  taskRunContext?: TaskRunPromptContext;
-  taskRunRecorder?: (args: {
-    options: RunAgentTurnOptions;
-    status: "running" | "completed" | "failed";
-    dialogId?: string;
-    resultSummary?: string;
-    errorCode?: string;
-    toolEvidence?: TaskRunToolEvidence;
-  }) => Promise<void>;
+  taskRowContext?: TaskRowContext;
   fetchImpl?: typeof fetch;
 };
 
@@ -120,7 +111,6 @@ const SERVER_PLATFORM_TOOL_NAMES = new Set([
   "deleteTableRows",
   "queryTableRows",
   "streamParallelAgents",
-  "taskRun",
   "updateTableRow",
   "updateTableRows",
 ]);
@@ -129,7 +119,6 @@ const KNOWN_SERVER_PLATFORM_AGENT_KEYS = new Set([
   MIMO_MONTH_AGENT_KEY,
   NOLO_PROJECT_MANAGER_AGENT_KEY,
   WIN_CODEX_AGENT_KEY,
-  NOLO_SENIOR_FULLSTACK_AGENT_KEY,
 ]);
 
 const KNOWN_SERVER_PLATFORM_AGENT_ALIASES = new Set([
@@ -197,6 +186,16 @@ function isMachineBoundLocalhostCustomProvider(agentConfig: any) {
   }
 }
 
+function isCliProviderAgentConfig(agentConfig: any) {
+  const cliProvider = typeof agentConfig?.cliProvider === "string"
+    ? agentConfig.cliProvider.trim()
+    : "";
+  const provider = typeof agentConfig?.provider === "string"
+    ? agentConfig.provider.trim()
+    : "";
+  return Boolean(cliProvider) || provider === "agy" || provider === "codex" || provider === "claude";
+}
+
 function resolveAuthToken(env: EnvLike) {
   return env.AUTH_TOKEN || env.AUTH || env.BENCHMARK_AUTH_TOKEN || "";
 }
@@ -234,21 +233,30 @@ async function shouldSkipAutoLocalForServerPlatformTools(options: RunAgentTurnOp
   if (options.localRuntimeCwd) {
     return false;
   }
-  if (isKnownServerPlatformAgent(options)) {
-    options.output.write(
-      `[nolo] auto runtime: skipping local runtime because ${options.agentKey} is a known platform agent. ` +
-        "Use --local explicitly to force local workspace tools.\n"
-    );
-    return true;
-  }
+  const knownServerPlatformAgent = isKnownServerPlatformAgent(options);
   const adapter = resolveLocalRuntimeAdapter(options);
-  if (!adapter) return false;
+  if (!adapter) return knownServerPlatformAgent;
   let agentConfig;
   try {
     agentConfig = await adapter.loadAgentConfig(options.agentKey);
   } catch {
+    if (knownServerPlatformAgent) {
+      options.output.write(
+        `[nolo] auto runtime: skipping local runtime because ${options.agentKey} is a known platform agent. ` +
+          "Use --local explicitly to force local workspace tools.\n"
+      );
+      return true;
+    }
     return false;
   }
+  if (isCliProviderAgentConfig(agentConfig)) return false;
+  if (knownServerPlatformAgent) {
+    options.output.write(
+      `[nolo] auto runtime: skipping local runtime because ${options.agentKey} is a known platform agent. ` +
+        "Use --local explicitly to force local workspace tools.\n"
+    );
+    return true;
+  }
   if (isMachineBoundLocalhostCustomProvider(agentConfig)) {
     options.output.write(
       `[nolo] auto runtime: skipping local runtime because ${options.agentKey} is a machine-bound localhost custom provider. ` +
@@ -276,6 +284,37 @@ function buildUserInputContent(message: string, imageUrls: string[] = []) {
   ];
 }
 
+function buildSubjectRefs(options: RunAgentTurnOptions) {
+  const refs: AgentRunSubjectRef[] = [];
+  const seen = new Set<string>();
+  const pushRef = (ref: AgentRunSubjectRef) => {
+    const kind = ref.kind.trim();
+    const id = ref.id.trim();
+    const role = ref.role?.trim();
+    if (!kind || !id) return;
+    const key = `${kind}\u0000${id}\u0000${role ?? ""}`;
+    if (seen.has(key)) return;
+    seen.add(key);
+    refs.push({ kind, id, ...(role ? { role } : {}) });
+  };
+  for (const ref of options.subjectRefs ?? []) pushRef(ref);
+  if (options.subjectDialogKey) {
+    pushRef({
+      kind: "dialog",
+      id: options.subjectDialogKey,
+      role: "subject",
+    });
+  }
+  if (options.taskRowContext?.rowDbKey) {
+    pushRef({
+      kind: "table-row",
+      id: options.taskRowContext.rowDbKey,
+      role: "task",
+    });
+  }
+  return refs.length ? refs : undefined;
+}
+
 function shouldTraceLocalTools(options: RunAgentTurnOptions) {
   const setting = (options.env.NOLO_TRACE_TOOLS ?? "").trim().toLowerCase();
   if (setting === "0" || setting === "false" || setting === "off") return false;
@@ -287,32 +326,6 @@ function resolveAgentEventMode(options: RunAgentTurnOptions): "text" | "jsonl" {
   return options.env.NOLO_AGENT_EVENTS === "jsonl" ? "jsonl" : "text";
 }
 
-function shouldCollectLocalToolEvidence(options: RunAgentTurnOptions) {
-  return Boolean(options.taskRunContext?.rowDbKey);
-}
-
-function summarizeLocalToolEvidence(events: LocalAgentToolEvent[]): TaskRunToolEvidence | undefined {
-  if (events.length === 0) return undefined;
-  const toolsUsed = [
-    ...new Set(
-      events
-        .filter((event) => event.type === "tool-call")
-        .map((event) => event.toolName)
-        .filter(Boolean)
-    ),
-  ];
-  const rounds = new Set(events.map((event) => event.round)).size;
-  return {
-    toolsUsed,
-    summary: {
-      callCount: events.filter((event) => event.type === "tool-call").length,
-      resultCount: events.filter((event) => event.type === "tool-result").length,
-      errorCount: events.filter((event) => event.type === "tool-error").length,
-      rounds,
-    },
-  };
-}
-
 function isMissingLocalAgentConfigError(error: unknown, agentRef: string) {
   return Boolean(
     error &&
@@ -349,6 +362,7 @@ function formatToolJsonEvent(event: LocalAgentToolEvent) {
     ...(typeof event.elapsedMs === "number" ? { elapsedMs: event.elapsedMs } : {}),
     ...(event.summary ? { summary: event.summary } : {}),
     ...(event.message ? { message: event.message } : {}),
+    ...(event.metadata ? { metadata: event.metadata } : {}),
   })}\n`;
 }
 
@@ -370,21 +384,12 @@ function shouldAttemptAutoLocal(options: RunAgentTurnOptions) {
   );
 }
 
-function inferTaskRunAgentRole(agentRef: string): TaskRunAgentRole {
-  const normalized = agentRef.toLowerCase();
-  if (normalized.includes("project-manager") || normalized.includes("manager")) return "pm";
-  if (normalized.includes("frontend")) return "frontend";
-  if (normalized.includes("fullstack")) return "fullstack";
-  if (normalized.includes("review")) return "reviewer";
-  return "codex";
-}
-
-export function classifyTaskRunReviewStatus(summary?: string): TaskRunReviewStatus | undefined {
+export function classifyTaskContextReviewStatus(summary?: string): TaskContextReviewStatus | undefined {
   const normalized = summary?.toLowerCase().trim();
   if (!normalized) return undefined;
 
   const explicit = normalized.match(/review\s+decision\s*:\s*(passed|needs_changes|blocked)/);
-  if (explicit?.[1]) return explicit[1] as TaskRunReviewStatus;
+  if (explicit?.[1]) return explicit[1] as TaskContextReviewStatus;
 
   if (/\b(blocked|cannot review|unable to review)\b|无法审查|阻塞/.test(normalized)) {
     return "blocked";
@@ -402,141 +407,6 @@ export function classifyTaskRunReviewStatus(summary?: string): TaskRunReviewStat
   return undefined;
 }
 
-async function runTaskRunCli(args: {
-  options: RunAgentTurnOptions;
-  cliArgs: string[];
-}) {
-  const scriptPath = join(args.options.scriptDir, "taskRun.ts");
-  const proc = Bun.spawn({
-    cmd: [process.execPath, scriptPath, ...args.cliArgs],
-    stdout: "pipe",
-    stderr: "pipe",
-    env: {
-      ...process.env,
-      ...args.options.env,
-      BASE_URL: args.options.serverUrl,
-    },
-  });
-  const [stdout, stderr, exitCode] = await Promise.all([
-    new Response(proc.stdout).text(),
-    new Response(proc.stderr).text(),
-    proc.exited,
-  ]);
-  if (exitCode !== 0) {
-    throw new Error((stderr || stdout || `taskRun.ts exited ${exitCode}`).trim());
-  }
-}
-
-async function defaultTaskRunRecorder(args: {
-  options: RunAgentTurnOptions;
-  status: "running" | "completed" | "failed";
-  dialogId?: string;
-  resultSummary?: string;
-  errorCode?: string;
-  toolEvidence?: TaskRunToolEvidence;
-}) {
-  const context = args.options.taskRunContext;
-  if (!context?.rowDbKey) return;
-  const role = inferTaskRunAgentRole(args.options.agentName || args.options.agentKey);
-  if (role === "reviewer" && args.status !== "running") {
-    await runTaskRunCli({
-      options: args.options,
-      cliArgs: [
-        "request-review",
-        "--row-dbkey",
-        context.rowDbKey,
-        "--base-url",
-        args.options.serverUrl,
-        "--reviewer-agent-key",
-        args.options.agentKey,
-        ...(context.artifactIds?.length ? ["--artifact-ids", context.artifactIds.join(",")] : []),
-        ...(args.dialogId ? ["--dialog-id", args.dialogId] : []),
-      ],
-    });
-  }
-  await runTaskRunCli({
-    options: args.options,
-    cliArgs: [
-      "record-agent-run",
-      "--row-dbkey",
-      context.rowDbKey,
-      "--base-url",
-      args.options.serverUrl,
-      "--agent-key",
-      args.options.agentKey,
-      "--role",
-      role,
-      "--run-status",
-      args.status,
-      ...(context.workItemId ? ["--work-item-id", context.workItemId] : []),
-      ...(args.dialogId ? ["--dialog-id", args.dialogId] : []),
-      ...(args.resultSummary ? ["--result-summary", args.resultSummary.slice(0, 240)] : []),
-      ...(args.errorCode ? ["--error-code", args.errorCode] : []),
-      ...(args.toolEvidence?.toolsUsed?.length
-        ? ["--tools-used", args.toolEvidence.toolsUsed.join(",")]
-        : []),
-      ...(args.toolEvidence?.summary
-        ? ["--tool-trace-summary", JSON.stringify(args.toolEvidence.summary)]
-        : []),
-    ],
-  });
-  if (context.workItemId && args.dialogId) {
-    await runTaskRunCli({
-      options: args.options,
-      cliArgs: [
-        "update-work-item",
-        "--row-dbkey",
-        context.rowDbKey,
-        "--base-url",
-        args.options.serverUrl,
-        "--id",
-        context.workItemId,
-        "--dialog-ids",
-        args.dialogId,
-      ],
-    });
-  }
-  if (role === "reviewer" && args.status !== "running") {
-    const reviewStatus =
-      args.status === "failed" ? "blocked" : classifyTaskRunReviewStatus(args.resultSummary);
-    if (reviewStatus) {
-      await runTaskRunCli({
-        options: args.options,
-        cliArgs: [
-          "review-result",
-          "--row-dbkey",
-          context.rowDbKey,
-          "--base-url",
-          args.options.serverUrl,
-          "--review-status",
-          reviewStatus,
-          "--reviewer-agent-key",
-          args.options.agentKey,
-          ...(context.artifactIds?.length ? ["--artifact-ids", context.artifactIds.join(",")] : []),
-          ...(args.dialogId ? ["--dialog-id", args.dialogId] : []),
-        ],
-      });
-    }
-  }
-}
-
-async function recordTaskRunOutcome(args: {
-  options: RunAgentTurnOptions;
-  status: "running" | "completed" | "failed";
-  dialogId?: string;
-  resultSummary?: string;
-  errorCode?: string;
-  toolEvidence?: TaskRunToolEvidence;
-}) {
-  if (!args.options.taskRunContext?.rowDbKey) return;
-  try {
-    await (args.options.taskRunRecorder ?? defaultTaskRunRecorder)(args);
-  } catch (error) {
-    args.options.output.write(
-      `[nolo] task-run writeback failed: ${error instanceof Error ? error.message : String(error)}\n`
-    );
-  }
-}
 
 function formatUsage(usage: any, dialogId: unknown) {
   const parts: string[] = [];
@@ -576,10 +446,11 @@ function buildTransportErrorHint(serverUrl: string, error: unknown) {
 
 async function runHttpAgentTurn(options: RunAgentTurnOptions, authToken: string) {
   const spinner = new Spinner(options.output, `${options.agentName} -> working`);
-  spinner.start();
-
-  const fetchImpl = options.fetchImpl ?? fetch;
-  let res: Response;
+  spinner.start();
+
+  const fetchImpl = options.fetchImpl ?? fetch;
+  const subjectRefs = buildSubjectRefs(options);
+  let res: Response;
   try {
     res = await fetchImpl(`${options.serverUrl}/api/agent/run`, {
       method: "POST",
@@ -590,7 +461,7 @@ async function runHttpAgentTurn(options: RunAgentTurnOptions, authToken: string)
       body: JSON.stringify({
         agentKey: options.agentKey,
         userInput: buildUserInputContent(
-          prependTaskRunPrompt(options.message, options.taskRunContext),
+          options.message,
           options.imageUrls
         ),
         runtimeContext: {
@@ -599,22 +470,7 @@ async function runHttpAgentTurn(options: RunAgentTurnOptions, authToken: string)
           runtime: "bun",
           entrypoint: "nolo-cli",
           capabilities: ["text-io", "streaming", "slash-commands"],
-          ...(options.taskRunContext
-            ? {
-                taskRun: {
-                  rowDbKey: options.taskRunContext.rowDbKey,
-                  ...(options.taskRunContext.taskRunId
-                    ? { taskRunId: options.taskRunContext.taskRunId }
-                    : {}),
-                  ...(options.taskRunContext.workItemId
-                    ? { workItemId: options.taskRunContext.workItemId }
-                    : {}),
-                  ...(options.taskRunContext.artifactIds?.length
-                    ? { artifactIds: options.taskRunContext.artifactIds }
-                    : {}),
-                },
-              }
-            : {}),
+          ...(subjectRefs ? { subjectRefs } : {}),
         },
         ...(options.continueDialogId
           ? { continueDialogId: options.continueDialogId }
@@ -640,16 +496,6 @@ async function runHttpAgentTurn(options: RunAgentTurnOptions, authToken: string)
   if (contentType.includes("text/event-stream") && res.body) {
     spinner.stop();
     const result = await readStreamingAgentRun(options, res);
-    await recordTaskRunOutcome({
-      options,
-      status: result.streamInterrupted
-        ? "running"
-        : result.exitCode === 0
-          ? "completed"
-          : "failed",
-      dialogId: result.dialogId,
-      ...(result.exitCode !== 0 ? { errorCode: "STREAM_FAILED" } : {}),
-    });
     return result;
   }
 
@@ -667,6 +513,7 @@ async function runHttpAgentTurn(options: RunAgentTurnOptions, authToken: string)
     const messageText = typeof data?.message === "string" ? data.message.trim() : "";
     const reasonText = typeof data?.reason === "string" ? data.reason.trim() : "";
     const codeText = typeof data?.code === "string" ? data.code.trim() : "";
+    const dialogIdText = typeof data?.dialogId === "string" ? data.dialogId.trim() : "";
     if (errorText || messageText) {
       options.output.write(`${errorText || messageText}\n`);
       if (messageText && messageText !== errorText) {
@@ -679,13 +526,13 @@ async function runHttpAgentTurn(options: RunAgentTurnOptions, authToken: string)
         options.output.write(`reason=${reasonText}\n`);
       }
     }
-    await recordTaskRunOutcome({
-      options,
-      status: "failed",
-      errorCode: `HTTP_${res.status}`,
-      resultSummary: String(data?.error || data?.message || "").trim() || undefined,
-    });
-    return { exitCode: 1 };
+    if (dialogIdText) {
+      options.output.write(`[nolo] failed dialog: ${dialogIdText}\n`);
+      options.output.write(
+        `[nolo] continue with: nolo agent run ${options.agentKey} --continue ${dialogIdText} --msg "retry"\n`
+      );
+    }
+    return dialogIdText ? { exitCode: 1, dialogId: dialogIdText } : { exitCode: 1 };
   }
 
   const content = String(data?.content ?? data?.message ?? "").trim();
@@ -703,12 +550,6 @@ async function runHttpAgentTurn(options: RunAgentTurnOptions, authToken: string)
       ? { dialogId: data.dialogId }
       : {}),
   };
-  await recordTaskRunOutcome({
-    options,
-    status: options.background ? "running" : "completed",
-    dialogId: result.dialogId,
-    ...(!options.background && content ? { resultSummary: content } : {}),
-  });
   return result;
 }
 
@@ -735,16 +576,14 @@ async function runLocalAgentTurnForCli(
 
   const spinner = new Spinner(options.output, `${options.agentName} -> working locally`);
   spinner.start();
-  const toolEvents: LocalAgentToolEvent[] = [];
   try {
     const traceLocalTools = shouldTraceLocalTools(options);
-    const collectToolEvidence = shouldCollectLocalToolEvidence(options);
     const eventMode = resolveAgentEventMode(options);
     const result = await runLocalAgentTurn({
       adapter,
       agentRef: options.agentKey,
       input: buildUserInputContent(
-        prependTaskRunPrompt(options.message, options.taskRunContext),
+        options.message,
         options.imageUrls
       ),
       continueDialogId: options.continueDialogId,
@@ -755,10 +594,9 @@ async function runLocalAgentTurnForCli(
       background: options.background,
       noStream: options.noStream,
       ...(typeof options.timeoutMs === "number" ? { timeoutMs: options.timeoutMs } : {}),
-      ...(traceLocalTools || collectToolEvidence
+      ...(traceLocalTools
         ? {
             onToolEvent: (event) => {
-              if (collectToolEvidence) toolEvents.push(event);
               if (traceLocalTools) {
                 spinner.stop();
                 options.output.write(
@@ -778,13 +616,6 @@ async function runLocalAgentTurnForCli(
     } else {
       options.output.write(`\n${options.agentName} > (no text response)\n`);
     }
-    await recordTaskRunOutcome({
-      options,
-      status: options.background ? "running" : "completed",
-      dialogId: result.dialogId,
-      ...(!options.background && content ? { resultSummary: content } : {}),
-      toolEvidence: summarizeLocalToolEvidence(toolEvents),
-    });
     return { exitCode: 0, dialogId: result.dialogId };
   } catch (error) {
     spinner.stop();
@@ -795,7 +626,7 @@ async function runLocalAgentTurnForCli(
         }\n`
       );
     }
-    return { exitCode: 1, localError: error, toolEvidence: summarizeLocalToolEvidence(toolEvents) };
+    return { exitCode: 1, localError: error };
   }
 }