nolo-cli 0.1.40 → 0.1.42

package/agent-runtime/noloWorkspaceTools.ts

@@ -7,6 +7,7 @@ export const NOLO_WORKSPACE_TOOL_NAMES = [
   "readSpace",
   "readDoc",
   "readSkillDoc",
+  "listTables",
   "queryTableRows",
   "cliWhoami",
   "cliDoctor",
@@ -15,7 +16,7 @@ export const NOLO_WORKSPACE_TOOL_NAMES = [
 export type NoloWorkspaceToolName = typeof NOLO_WORKSPACE_TOOL_NAMES[number];
 
 export const NOLO_WORKSPACE_TOOL_PROMPT =
-  "Nolo workspace tools are available for Nolo data: use listDialogs/readDialog, listAgents/readAgent, listSpaces/readSpace, readDoc/readSkillDoc, queryTableRows, cliWhoami, and cliDoctor when the user asks to inspect Nolo workspace data. Prefer tools over guessing, and combine tool results when the user asks for summaries or analysis.";
+  "Nolo workspace tools are available for Nolo data: use listDialogs/readDialog, listAgents/readAgent, listSpaces/readSpace, readDoc/readSkillDoc, listTables/queryTableRows, cliWhoami, and cliDoctor when the user asks to inspect Nolo workspace data. Prefer tools over guessing, and combine tool results when the user asks for summaries or analysis.";
 
 const NOLO_WORKSPACE_TOOL_NAME_SET = new Set<string>(NOLO_WORKSPACE_TOOL_NAMES);
 const DIALOG_ID_RE = /^[0-9A-HJKMNP-TV-Z]{26}$/i;
@@ -79,6 +80,12 @@ export function buildNoloWorkspaceOpenAiTools(args: { toolNames?: string[] }) {
   add("readSkillDoc", "Read one skill doc in the Nolo workspace.", {
     doc: stringToolParam("Skill doc/page key."),
   }, ["doc"]);
+  add("listTables", "List tables in the current user scope or an optional space scope.", {
+    limit: { type: "integer", description: "Maximum tables to return." },
+    space: stringToolParam("Optional space id or URL."),
+    titleQuery: stringToolParam("Optional case-insensitive title substring."),
+    purpose: stringToolParam("Optional purpose value such as agent_eval_workbench."),
+  });
   add("queryTableRows", "Query rows from a Nolo table.", {
     table: stringToolParam("Table id or meta key."),
     limit: { type: "integer", description: "Optional row limit." },
@@ -274,6 +281,18 @@ export function buildNoloWorkspaceCommandArgs(call: { name: string; arguments: s
       if (!doc) throw new Error("readSkillDoc requires doc.");
       return ["skill-doc", "read", doc];
     }
+    case "listTables": {
+      const cliArgs = ["table", "list"];
+      const limit = noloPositiveIntegerString(args.limit);
+      const space = noloStringArg(args.space ?? args.spaceId);
+      const titleQuery = noloStringArg(args.titleQuery);
+      const purpose = noloStringArg(args.purpose);
+      if (limit) cliArgs.push("--limit", limit);
+      if (space) cliArgs.push("--space", space);
+      if (titleQuery) cliArgs.push("--title-query", titleQuery);
+      if (purpose) cliArgs.push("--purpose", purpose);
+      return cliArgs;
+    }
     case "queryTableRows": {
       const table = noloStringArg(args.table ?? args.tableId ?? args.metaKey);
       if (!table) throw new Error("queryTableRows requires table.");

package/agent-runtime/runtimeToolPolicy.ts

@@ -181,14 +181,10 @@ function applyWebRuntimeSafetyBaseline(
 
 export function resolveEffectiveRuntimeToolPolicy(args: {
   agentConfig: Pick<AgentRuntimeAgentConfig, "runtimeToolPolicy" | "runtimeBinding">;
-  taskRunControl?: { runtimeToolPolicy?: unknown } | null;
   host?: AgentRuntimeHost;
 }): AgentRuntimeToolPolicy | undefined {
   const agentPolicy = resolveCurrentRunRuntimeToolPolicy(args.agentConfig);
-  const taskPolicy = normalizeAgentRuntimeToolPolicy(
-    args.taskRunControl?.runtimeToolPolicy,
-  );
-  const effectivePolicy = mergeAgentRuntimeToolPolicies(agentPolicy, taskPolicy);
+  const effectivePolicy = mergeAgentRuntimeToolPolicies(agentPolicy);
   return args.host === "web"
     ? applyWebRuntimeSafetyBaseline(effectivePolicy)
     : effectivePolicy;

package/agent-runtime/runtimeToolSurface.ts

@@ -7,6 +7,7 @@ export const DEFAULT_PRIVATE_NOLO_WORKSPACE_TOOLS = [
   "readSpace",
   "readDoc",
   "readSkillDoc",
+  "listTables",
   "queryTableRows",
   "cliWhoami",
   "cliDoctor",

package/agentAliases.ts

@@ -1,13 +1,9 @@
-export const PLATFORM_DEMO_USER_ID = "b2e06f801f";
 export const CURRENT_OPERATOR_USER_ID = "0e95801d90";
 export const NOLO_DEFAULT_AGENT_ID = "01NOLOAPPBLD000000019KCKT0";
 export const NOLO_DEFAULT_AGENT_KEY = `agent-pub-${NOLO_DEFAULT_AGENT_ID}`;
 export const NOLO_PROJECT_MANAGER_AGENT_ID = "01NOLOPROJMGR00000000MSVGG";
 export const NOLO_PROJECT_MANAGER_AGENT_KEY =
-  `agent-${PLATFORM_DEMO_USER_ID}-${NOLO_PROJECT_MANAGER_AGENT_ID}`;
-export const NOLO_SENIOR_FULLSTACK_AGENT_ID = "01NOLOFULLSTK00000000T3XR4";
-export const NOLO_SENIOR_FULLSTACK_AGENT_KEY =
-  `agent-${PLATFORM_DEMO_USER_ID}-${NOLO_SENIOR_FULLSTACK_AGENT_ID}`;
+  `agent-${CURRENT_OPERATOR_USER_ID}-${NOLO_PROJECT_MANAGER_AGENT_ID}`;
 export const NOLO_FRONTEND_AGENT_ID = "01FRONTENDAG0000000115N4E1";
 export const NOLO_FRONTEND_AGENT_KEY =
   `agent-${CURRENT_OPERATOR_USER_ID}-${NOLO_FRONTEND_AGENT_ID}`;
@@ -20,6 +16,15 @@ export const WIN_QWEN_AGENT_KEY =
 export const MIMO_MONTH_AGENT_ID = "01MIMO25MONTH0000000NEW001";
 export const MIMO_MONTH_AGENT_KEY =
   `agent-0e95801d90-${MIMO_MONTH_AGENT_ID}`;
+export const QODER_AGENT_ID = "01QODERCLIAGENT00000000NEW";
+export const QODER_AGENT_KEY =
+  `agent-0e95801d90-${QODER_AGENT_ID}`;
+export const LOCAL_CODEX_AGENT_ID = "01LOCALCODEXCLI000000NEW";
+export const LOCAL_CODEX_AGENT_KEY =
+  `agent-${CURRENT_OPERATOR_USER_ID}-${LOCAL_CODEX_AGENT_ID}`;
+export const LOCAL_QODER_AGENT_ID = "01LOCALQODERCLI000000NEW";
+export const LOCAL_QODER_AGENT_KEY =
+  `agent-${CURRENT_OPERATOR_USER_ID}-${LOCAL_QODER_AGENT_ID}`;
 
 const AGENT_ALIAS_TO_KEY: Record<string, string> = {
   nolo: NOLO_DEFAULT_AGENT_KEY,
@@ -48,6 +53,21 @@ const AGENT_ALIAS_TO_KEY: Record<string, string> = {
   "全栈": MIMO_MONTH_AGENT_KEY,
   "nolo 全栈工程师": MIMO_MONTH_AGENT_KEY,
 
+  // Qoder CLI (本机 Qoder CLI 实现 agent)
+  qoder: QODER_AGENT_KEY,
+  "qoder-agent": QODER_AGENT_KEY,
+  "qoder cli": QODER_AGENT_KEY,
+  "qoder-cli": QODER_AGENT_KEY,
+
+  // Explicit local CLI agents. These are ordinary private agent records that
+  // run through the current computer local runtime when unbound.
+  "local-codex": LOCAL_CODEX_AGENT_KEY,
+  "codex-local": LOCAL_CODEX_AGENT_KEY,
+  "local codex": LOCAL_CODEX_AGENT_KEY,
+  "local-qoder": LOCAL_QODER_AGENT_KEY,
+  "qoder-local": LOCAL_QODER_AGENT_KEY,
+  "local qoder": LOCAL_QODER_AGENT_KEY,
+
   // 产品前端实现
   "frontend": NOLO_FRONTEND_AGENT_KEY,
   "frontend-agent": NOLO_FRONTEND_AGENT_KEY,
@@ -70,10 +90,6 @@ const AGENT_ALIAS_TO_KEY: Record<string, string> = {
   pm: NOLO_PROJECT_MANAGER_AGENT_KEY,
   "项目经理": NOLO_PROJECT_MANAGER_AGENT_KEY,
   "nolo 项目经理": NOLO_PROJECT_MANAGER_AGENT_KEY,
-  "senior-fullstack": NOLO_SENIOR_FULLSTACK_AGENT_KEY,
-  "nolo-senior-fullstack": NOLO_SENIOR_FULLSTACK_AGENT_KEY,
-  "高级全栈": NOLO_SENIOR_FULLSTACK_AGENT_KEY,
-  "nolo 高级全栈工程师": NOLO_SENIOR_FULLSTACK_AGENT_KEY,
 };
 
 function parseAgentKeyFromInput(raw: string): string {
@@ -88,3 +104,7 @@ function parseAgentKeyFromInput(raw: string): string {
 export function resolveCliAgentKeyInput(raw: string): string {
   return AGENT_ALIAS_TO_KEY[raw.trim().toLowerCase()] ?? parseAgentKeyFromInput(raw);
 }
+
+export function isLocalCliAgentKey(agentKey: string): boolean {
+  return agentKey === LOCAL_CODEX_AGENT_KEY || agentKey === LOCAL_QODER_AGENT_KEY;
+}

package/agentInternalCommandEntries.ts

@@ -11,6 +11,7 @@ import {
   runAgentCreateCommand,
 } from "./agentRecordCommands";
 import { runAgentRunCommand } from "./agentRunCommand";
+import { runQoderUsageCommand } from "./qoderUsageProbe";
 import {
   createEnvCommand,
   createEnvScriptDirCommand,
@@ -19,18 +20,25 @@ import type { CommandEntry } from "./cliCommandTypes";
 import { runSetupOfflineMarxistsAgentCommand } from "./offlineMarxistsAgentCommand";
 
 export function getAgentInternalCommandEntries(): CommandEntry[] {
+  const createAgentRunCommand = (path: string[], description: string): CommandEntry =>
+    createEnvScriptDirCommand(path, description, (args, deps) =>
+      runAgentRunCommand(args, { ...deps, commandPath: path })
+    );
+
   return [
-    createEnvScriptDirCommand(["chat"], "Chat with an agent", runAgentRunCommand),
+    createAgentRunCommand(["run"], "Run a no-login local agent in this workspace"),
+    createAgentRunCommand(["chat"], "Chat with an agent"),
     createEnvCommand(["agent", "list"], "List owned agents", runAgentListCommand),
     createEnvCommand(["agent", "create"], "Create a new agent", runAgentCreateCommand),
     createEnvCommand(["agent", "pull"], "Cache an agent for local runs", runAgentPullCommand),
     createEnvCommand(["agent", "read"], "Read a single agent", runAgentReadCommand),
-    createEnvScriptDirCommand(["agent", "run"], "Run an agent", runAgentRunCommand),
+    createAgentRunCommand(["agent", "run"], "Run an agent"),
+    createEnvCommand(["agent", "usage"], "Read local provider usage for an agent", runQoderUsageCommand),
     createEnvCommand(["agent", "setup-offline-marxists"], "Create or update the Marxists.org offline book agent", runSetupOfflineMarxistsAgentCommand),
     createEnvCommand(["agent", "update"], "Update agent fields", runAgentUpdateCommand),
     createEnvCommand(["agent", "bind-current"], "Bind an agent to this machine", runAgentBindCurrentCommand),
     createEnvCommand(["agent", "smoke-current"], "Smoke test a bound agent through this machine", runAgentSmokeCurrentCommand),
     createEnvCommand(["agent", "runtime-doctor"], "Diagnose current machine runtime compatibility", runAgentRuntimeDoctorCommand),
-    createEnvScriptDirCommand(["agent", "chat"], "Chat with an agent", runAgentRunCommand),
+    createAgentRunCommand(["agent", "chat"], "Chat with an agent"),
   ];
 }

package/agentMachineCommands.ts

@@ -54,6 +54,7 @@ function requiredCapabilityForAgent(agent: any) {
     gemini: "gemini-cli",
     kimi: "kimi-cli",
     agy: "agy-cli",
+    qoder: "qoder-cli",
   };
   return capabilityByProvider[cliProvider] ?? "";
 }

package/agentRecordCommands.ts

@@ -76,7 +76,7 @@ export async function runAgentUpdateCommand(
   }
   if (!parsed) {
     output.write(
-      "Usage: nolo agent update <agent> [--model <id>] [--cli-provider <provider>] [--api-source <source>] [--prompt <text> | --prompt-file <path> | --prompt-doc <pageKey>] [--tools <json>] [--copy-provider-from <agent>] [--field key=value]\n"
+      "Usage: nolo agent update <agent> [--model <id>] [--cli-provider <provider>] [--api-source <source>] [--max-concurrent <n>] [--expires-at <iso>] [--usage-probe qoder-local-quota-log] [--prompt <text> | --prompt-file <path> | --prompt-doc <pageKey>] [--tools <json>] [--copy-provider-from <agent>] [--field key=value]\n"
     );
     return args[0] ? 0 : 1;
   }
@@ -158,7 +158,7 @@ export async function runAgentCreateCommand(
   }
   if (!parsed) {
     output.write(
-      "Usage: nolo agent create <agent> [--model <id>] [--cli-provider <provider>] [--api-source <source>] [--prompt <text> | --prompt-file <path> | --prompt-doc <pageKey>] [--tools <json>] [--copy-provider-from <agent>] [--name <name>] [--custom-provider-url <url>] [--provider-api-key <key>] [--field key=value]\n"
+      "Usage: nolo agent create <agent> [--model <id>] [--cli-provider <provider>] [--api-source <source>] [--max-concurrent <n>] [--expires-at <iso>] [--usage-probe qoder-local-quota-log] [--prompt <text> | --prompt-file <path> | --prompt-doc <pageKey>] [--tools <json>] [--copy-provider-from <agent>] [--name <name>] [--custom-provider-url <url>] [--provider-api-key <key>] [--field key=value]\n"
     );
     return args[0] ? 0 : 1;
   }

package/agentRecordHelpers.ts

@@ -1,4 +1,6 @@
 import { readFileSync } from "node:fs";
+import { DataType } from "./create/types";
+import { createAgentKey } from "./database/keys";
 import { resolveCliAgentKeyInput } from "./agentAliases";
 import type { CliKvDb } from "./client/hybridRecordStore";
 import { buildLocalAgentLookupKeys, shouldReadAgentKeyRemotely } from "./client/localAgentRecords";
@@ -41,6 +43,36 @@ function parseJsonishValue(raw: string) {
   }
 }
 
+function parsePositiveIntegerOption(raw: string | undefined, flag: string) {
+  if (!raw) return undefined;
+  const value = Number(raw);
+  if (!Number.isInteger(value) || value <= 0) {
+    throw new Error(`${flag} must be a positive integer.`);
+  }
+  return value;
+}
+
+function parseIsoTimestampOption(raw: string | undefined, flag: string) {
+  if (!raw) return undefined;
+  const time = Date.parse(raw);
+  if (!Number.isFinite(time)) {
+    throw new Error(`${flag} must be an ISO timestamp.`);
+  }
+  return new Date(time).toISOString();
+}
+
+function buildUsageProbeConfig(kind: string | undefined) {
+  if (!kind) return undefined;
+  if (kind !== "qoder-local-quota-log") {
+    throw new Error("--usage-probe currently supports qoder-local-quota-log.");
+  }
+  return {
+    kind,
+    command: "nolo agent usage qoder",
+    capability: "qoder-usage",
+  };
+}
+
 async function curlFetch(url: string, init?: RequestInit): Promise<Response> {
   const method = init?.method ?? "GET";
   const headers = new Headers(init?.headers ?? {});
@@ -341,6 +373,12 @@ export function parseAgentUpdateArgs(args: string[]) {
   const name = readOption(args, "--name");
   const customProviderUrl = readOption(args, "--custom-provider-url");
   const apiKey = readOption(args, "--api-key");
+  const maxConcurrent = parsePositiveIntegerOption(
+    readOption(args, "--max-concurrent"),
+    "--max-concurrent",
+  );
+  const expiresAt = parseIsoTimestampOption(readOption(args, "--expires-at"), "--expires-at");
+  const usageProbe = buildUsageProbeConfig(readOption(args, "--usage-probe"));
 
   const promptSources = [prompt, promptFile, promptDoc].filter(Boolean);
   if (promptSources.length > 1) {
@@ -357,6 +395,13 @@ export function parseAgentUpdateArgs(args: string[]) {
   if (name) updates.name = name;
   if (customProviderUrl) updates.customProviderUrl = customProviderUrl;
   if (apiKey) updates.apiKey = apiKey;
+  if (maxConcurrent != null) updates.admission = { maxConcurrent };
+  if (expiresAt || usageProbe) {
+    updates.scheduling = {
+      ...(expiresAt ? { expiresAt } : {}),
+      ...(usageProbe ? { usageProbe } : {}),
+    };
+  }
 
   for (const entry of readRepeatedOption(args, "--field")) {
     const index = entry.indexOf("=");
@@ -384,8 +429,12 @@ export async function buildCreatedAgentRecord(args: {
   fallbackFetchImpl?: typeof fetch;
   authToken: string;
 }) {
-  const agentKey = resolveCliAgentKeyInput(args.parsed.agentInput);
   const serverUrl = args.cliArgs ? resolveServerUrl(args.cliArgs, args.env) : resolveServerUrl(args.env);
+  const userId = parseUserIdFromAuthToken(args.authToken);
+  const resolvedAgentInput = resolveCliAgentKeyInput(args.parsed.agentInput);
+  const agentKey = resolvedAgentInput.startsWith("agent-")
+    ? resolvedAgentInput
+    : createAgentKey.private(userId || "local", resolvedAgentInput);
 
   if (args.parsed.copyProviderFrom) {
     const providerSource = await resolveAgentRecordFromHybridStore({
@@ -421,12 +470,11 @@ export async function buildCreatedAgentRecord(args: {
     args.parsed.updates.prompt = promptBody;
   }
 
-  const userId = parseUserIdFromAuthToken(args.authToken);
-
   const nextRecord = {
     ...args.parsed.updates,
     dbKey: agentKey,
     key: agentKey,
+    type: DataType.AGENT,
     createdAt: Date.now(),
     updatedAt: Date.now(),
     userId,
@@ -458,9 +506,14 @@ export async function buildUpdatedAgentRecord(args: {
     fallbackFetchImpl: args.fallbackFetchImpl,
   });
   const agentKey = cached?.agentKey ?? resolveCliAgentKeyInput(args.parsed.agentInput);
-  const serverUrl = cached?.record?.serverOrigin ?? (
-    args.cliArgs ? resolveServerUrl(args.cliArgs, args.env) : resolveServerUrl(args.env)
-  );
+  const explicitServerUrl = args.cliArgs
+    ? readOption(args.cliArgs, "--server-url") || readOption(args.cliArgs, "--server")
+    : undefined;
+  const envServerUrl = args.env.NOLO_SERVER || args.env.BASE_URL || args.env.NOLO_SERVER_URL;
+  const requestedServerUrl = explicitServerUrl || envServerUrl
+    ? (args.cliArgs ? resolveServerUrl(args.cliArgs, args.env) : resolveServerUrl(args.env))
+    : undefined;
+  const serverUrl = requestedServerUrl || cached?.record?.serverOrigin || resolveServerUrl(args.env);
   const currentRecord = await readAgentRecord({
     agentKey,
     authToken: args.authToken,

package/agentRunCommand.ts

@@ -1,11 +1,10 @@
 import { DEFAULT_NOLO_SERVER_URL } from "./defaultServer";
-import { runAgentTurn, type RunAgentTurnResult } from "./client/agentRun";
+import { runAgentTurn, type RunAgentTurnResult, type TaskRowContext } from "./client/agentRun";
 import type { AgentRuntimeHostAdapter, AgentRuntimeRequestedMode } from "./agentRuntimeLocal";
 import { existsSync, readFileSync } from "node:fs";
 import { extname, resolve } from "node:path";
 import { parseSkillDocProtocol, type WorkflowReferenceConfig } from "./ai/skills/skillDocProtocol";
-import { MIMO_MONTH_AGENT_KEY, resolveCliAgentKeyInput } from "./agentAliases";
-import type { TaskRunPromptContext } from "./client/taskRunPrompt";
+import { LOCAL_CODEX_AGENT_KEY, MIMO_MONTH_AGENT_KEY, isLocalCliAgentKey, resolveCliAgentKeyInput } from "./agentAliases";
 
 type EnvLike = Record<string, string | undefined>;
 
@@ -17,6 +16,7 @@ type AgentRunCommandDeps = {
   env?: EnvLike;
   scriptDir: string;
   output?: OutputLike;
+  commandPath?: string[];
   runner?: typeof runAgentTurn;
   localRuntimeAdapterFactory?: (env: EnvLike, options?: { cwd?: string }) => AgentRuntimeHostAdapter;
   inspectLocalRunWorkspace?: typeof inspectLocalRunWorkspace;
@@ -35,6 +35,7 @@ type LocalRunWorkspaceInspection = {
 
 type ParseAgentRunArgsOptions = {
   readTextFile?: (path: string) => string;
+  commandPath?: string[];
 };
 
 type ParsedAgentRunArgs = {
@@ -48,6 +49,8 @@ type ParsedAgentRunArgs = {
   category?: string;
   inheritedFromDialogKey?: string;
   parentDialogId?: string;
+  subjectDialogKey?: string;
+  subjectRefs?: Array<{ kind: string; id: string; role?: string }>;
   background: boolean;
   noStream: boolean;
   cwd?: string;
@@ -55,7 +58,7 @@ type ParsedAgentRunArgs = {
   traceTools: boolean;
   eventsMode?: "jsonl";
   injectFeatureWorktreeInstruction: boolean;
-  taskRunContext?: TaskRunPromptContext;
+  taskRowContext?: TaskRowContext;
   workflowRef?: string;
 };
 
@@ -111,6 +114,20 @@ function parsePositiveInteger(value: string | undefined) {
   return Math.floor(parsed);
 }
 
+function parseSubjectRef(raw: string): { kind: string; id: string; role?: string } | null {
+  const value = raw.trim();
+  if (!value) return null;
+  const firstColon = value.indexOf(":");
+  if (firstColon <= 0 || firstColon === value.length - 1) return null;
+  const kind = value.slice(0, firstColon).trim();
+  const rest = value.slice(firstColon + 1).trim();
+  const lastColon = rest.lastIndexOf(":");
+  const id = lastColon > 0 ? rest.slice(0, lastColon).trim() : rest;
+  const role = lastColon > 0 ? rest.slice(lastColon + 1).trim() : "";
+  if (!kind || !id) return null;
+  return { kind, id, ...(role ? { role } : {}) };
+}
+
 function positionalArgs(args: string[]) {
   const values: string[] = [];
   const valuelessFlags = new Set([
@@ -139,14 +156,18 @@ export function parseAgentRunArgs(
   args: string[],
   options: ParseAgentRunArgsOptions = {}
 ): ParsedAgentRunArgs | null {
-  const rawAgentKey = readFlagValue(args, "--agent") ?? positionalArgs(args)[0];
+  const positional = positionalArgs(args);
+  const isNoLoginRunShorthand =
+    (options.commandPath?.join(" ") === "run" || options.commandPath?.join(" ") === "chat") &&
+    !readFlagValue(args, "--agent");
+  const rawAgentKey = readFlagValue(args, "--agent") ?? (isNoLoginRunShorthand ? LOCAL_CODEX_AGENT_KEY : positional[0]);
   const agentKey = rawAgentKey ? resolveCliAgentKeyInput(rawAgentKey) : undefined;
   const explicitMsg = readFlagValue(args, "--msg");
   const msgFile = readFlagValue(args, "--msg-file");
   const fileMessage = msgFile
     ? (options.readTextFile ?? ((path: string) => readFileSync(path, "utf8")))(msgFile)
     : undefined;
-  const rawMessage = explicitMsg ?? fileMessage ?? positionalArgs(args).slice(1).join(" ");
+  const rawMessage = explicitMsg ?? fileMessage ?? positional.slice(isNoLoginRunShorthand ? 0 : 1).join(" ");
   if (!agentKey || !rawMessage.trim()) return null;
   const message = rawMessage.trim();
   const runtimeMode = runtimeModeFromArgs(args);
@@ -154,6 +175,13 @@ export function parseAgentRunArgs(
   const spaceId = readFlagValue(args, "--space");
   const category = readFlagValue(args, "--category");
   const inheritedFromDialog = readFlagValue(args, "--inherit-from-dialog");
+  const subjectDialog =
+    readFlagValue(args, "--subject-dialog") ??
+    readFlagValue(args, "--reference-dialog");
+  const subjectDialogKey = subjectDialog?.trim();
+  const subjectRefs = readRepeatedFlagValues(args, "--subject-ref")
+    .map(parseSubjectRef)
+    .filter((ref): ref is { kind: string; id: string; role?: string } => Boolean(ref));
   const cwd = readFlagValue(args, "--cwd");
   const timeoutMs = parsePositiveInteger(readFlagValue(args, "--timeout-ms"));
   const rawEventsMode = readFlagValue(args, "--events");
@@ -167,6 +195,8 @@ export function parseAgentRunArgs(
   ];
   const mimoLocalWorkspaceDefault =
     isMonthlyMimoAgentRef(rawAgentKey, agentKey) && runtimeMode !== "server";
+  const explicitLocalCliAgentDefault =
+    isLocalCliAgentKey(agentKey) && runtimeMode !== "server";
   const workflowRef = readFlagValue(args, "--workflow");
   const taskRowDbKey = readFlagValue(args, "--task-row-dbkey");
   const artifactIds = readFlagValue(args, "--artifact-ids")
@@ -177,24 +207,22 @@ export function parseAgentRunArgs(
     agentKey,
     message,
     imageUrls,
-    allowShell: args.includes("--dangerously-allow-shell") || mimoLocalWorkspaceDefault,
+    allowShell: args.includes("--dangerously-allow-shell") || mimoLocalWorkspaceDefault || explicitLocalCliAgentDefault,
     traceTools: args.includes("--trace-tools"),
     ...(eventsMode ? { eventsMode } : {}),
     injectFeatureWorktreeInstruction: mimoLocalWorkspaceDefault,
     ...(workflowRef ? { workflowRef } : {}),
     ...(taskRowDbKey
       ? {
-          taskRunContext: {
+          taskRowContext: {
             rowDbKey: taskRowDbKey,
-            ...(readFlagValue(args, "--task-run-id") ? { taskRunId: readFlagValue(args, "--task-run-id") } : {}),
-            ...(readFlagValue(args, "--work-item-id") ? { workItemId: readFlagValue(args, "--work-item-id") } : {}),
             ...(artifactIds?.length ? { artifactIds } : {}),
           },
         }
       : {}),
     ...(runtimeMode
       ? { runtimeMode }
-      : mimoLocalWorkspaceDefault || args.includes("--dangerously-allow-shell")
+      : mimoLocalWorkspaceDefault || explicitLocalCliAgentDefault || args.includes("--dangerously-allow-shell")
         ? { runtimeMode: "local" as const }
         : {}),
     background: args.includes("--bg"),
@@ -204,6 +232,8 @@ export function parseAgentRunArgs(
     ...(category ? { category } : {}),
     ...(inheritedRef?.dialogKey ? { inheritedFromDialogKey: inheritedRef.dialogKey } : {}),
     ...(inheritedRef?.dialogId ? { parentDialogId: inheritedRef.dialogId } : {}),
+    ...(subjectDialogKey ? { subjectDialogKey } : {}),
+    ...(subjectRefs.length ? { subjectRefs } : {}),
     ...(cwd ? { cwd } : {}),
     ...(typeof timeoutMs === "number" ? { timeoutMs } : {}),
   };
@@ -274,6 +304,19 @@ function prependFeatureWorktreeInstruction(message: string, enabled: boolean) {
   ].join("\n");
 }
 
+export function prependSubjectDialogMarker(
+  message: string,
+  subjectDialogKey: string | undefined
+) {
+  if (!subjectDialogKey) return message;
+  return [
+    `Subject dialog for this run: ${subjectDialogKey}`,
+    "If the user asks to evaluate the referenced dialog, call readDialog with this id/key first.",
+    "",
+    message,
+  ].join("\n");
+}
+
 function parseDialogReference(rawInput: string) {
   const normalized = rawInput.trim();
   if (normalized.startsWith("dialog-")) {
@@ -396,19 +439,36 @@ function buildLocalRunEnv(args: {
   };
 }
 
-function writeUsage(output: OutputLike) {
+function writeUsage(output: OutputLike, commandPath?: string[]) {
+  const commandName = commandPath?.join(" ");
+  if (commandName === "run") {
+    output.write(
+      "Usage: nolo run <message> [--cwd <path>] [--events jsonl]\n" +
+        "       nolo run --msg <message> [--cwd <path>] [--image <url-or-path>]\n" +
+        "Runs local Codex in the current workspace; no Nolo login required.\n"
+    );
+    return;
+  }
+  if (commandName === "chat") {
+    output.write(
+      "Usage: nolo chat <message> [--cwd <path>] [--events jsonl]\n" +
+        "       nolo chat --agent <agent> (--msg <message>|--msg-file <path>) [--local|--server|--auto]\n" +
+        "Without --agent, this uses local Codex in the current workspace; no Nolo login required.\n"
+    );
+    return;
+  }
   output.write(
     "Usage: nolo agent run <agent> <message> [--local|--server|--auto] [--continue <dialogId>] [--cwd <path>]\n" +
-      "       nolo agent run --agent <agent> (--msg <message>|--msg-file <path>) [--image <url-or-path>] [--space <spaceId>] [--category <name>] [--inherit-from-dialog <dialog>] [--task-row-dbkey <key>] [--bg] [--timeout-ms <n>] [--events jsonl] [--no-stream]\n"
+      "       nolo agent run --agent <agent> (--msg <message>|--msg-file <path>) [--image <url-or-path>] [--space <spaceId>] [--category <name>] [--inherit-from-dialog <dialog>] [--subject-dialog <dialog>] [--subject-ref <kind:id[:role]>] [--task-row-dbkey <key>] [--bg] [--timeout-ms <n>] [--events jsonl] [--no-stream]\n"
   );
 }
 
 export async function runAgentRunCommand(args: string[], deps: AgentRunCommandDeps) {
   const env = deps.env ?? process.env;
   const output = deps.output ?? process.stdout;
-  const parsed = parseAgentRunArgs(args);
+  const parsed = parseAgentRunArgs(args, { commandPath: deps.commandPath });
   if (!parsed) {
-    writeUsage(output);
+    writeUsage(output, deps.commandPath);
     return 1;
   }
 
@@ -437,9 +497,12 @@ export async function runAgentRunCommand(args: string[], deps: AgentRunCommandDe
     agentKey: parsed.agentKey,
     serverUrl: resolveServerUrl(env),
     message: prependWorkflowReferencePrompt(
-      prependFeatureWorktreeInstruction(
-        parsed.message,
-        parsed.injectFeatureWorktreeInstruction
+      prependSubjectDialogMarker(
+        prependFeatureWorktreeInstruction(
+          parsed.message,
+          parsed.injectFeatureWorktreeInstruction
+        ),
+        parsed.subjectDialogKey
       ),
       workflowReference
     ),
@@ -457,12 +520,14 @@ export async function runAgentRunCommand(args: string[], deps: AgentRunCommandDe
     ...(parsed.category ? { category: parsed.category } : {}),
     ...(parsed.inheritedFromDialogKey ? { inheritedFromDialogKey: parsed.inheritedFromDialogKey } : {}),
     ...(parsed.parentDialogId ? { parentDialogId: parsed.parentDialogId } : {}),
+    ...(parsed.subjectDialogKey ? { subjectDialogKey: parsed.subjectDialogKey } : {}),
+    ...(parsed.subjectRefs?.length ? { subjectRefs: parsed.subjectRefs } : {}),
     background: parsed.background,
     noStream: parsed.noStream,
     ...(typeof parsed.timeoutMs === "number" ? { timeoutMs: parsed.timeoutMs } : {}),
     traceTools: parsed.traceTools,
     ...(parsed.eventsMode ? { eventsMode: parsed.eventsMode } : {}),
-    ...(parsed.taskRunContext ? { taskRunContext: parsed.taskRunContext } : {}),
+    ...(parsed.taskRowContext ? { taskRowContext: parsed.taskRowContext } : {}),
   });
 
   if (result.dialogId) {