nolo-cli 0.1.38 → 0.1.39

package/agentRunCommand.ts

@@ -4,13 +4,7 @@ import type { AgentRuntimeHostAdapter, AgentRuntimeRequestedMode } from "./agent
 import { existsSync, readFileSync } from "node:fs";
 import { extname, resolve } from "node:path";
 import { parseSkillDocProtocol, type WorkflowReferenceConfig } from "./ai/skills/skillDocProtocol";
-import { resolveCliAgentKeyInput } from "./agentAliases";
-import {
-  ensureWorkspacePackageLinks,
-  formatPreparedTaskWorktree,
-  prepareTaskWorktree,
-  type PreparedTaskWorktree,
-} from "./client/taskWorktree";
+import { MIMO_MONTH_AGENT_KEY, resolveCliAgentKeyInput } from "./agentAliases";
 import type { TaskRunPromptContext } from "./client/taskRunPrompt";
 
 type EnvLike = Record<string, string | undefined>;
@@ -25,8 +19,6 @@ type AgentRunCommandDeps = {
   output?: OutputLike;
   runner?: typeof runAgentTurn;
   localRuntimeAdapterFactory?: (env: EnvLike, options?: { cwd?: string }) => AgentRuntimeHostAdapter;
-  prepareTaskWorktree?: typeof prepareTaskWorktree;
-  ensureWorkspacePackageLinks?: typeof ensureWorkspacePackageLinks;
   inspectLocalRunWorkspace?: typeof inspectLocalRunWorkspace;
   resolveWorkflowReference?: typeof resolveWorkflowReference;
 };
@@ -63,7 +55,7 @@ type ParsedAgentRunArgs = {
   maxToolRounds?: number;
   timeoutMs?: number;
   traceTools: boolean;
-  useTaskWorktree: boolean;
+  injectFeatureWorktreeInstruction: boolean;
   taskRunContext?: TaskRunPromptContext;
   workflowRef?: string;
 };
@@ -102,6 +94,21 @@ function runtimeModeFromArgs(args: string[]): AgentRuntimeRequestedMode | undefi
   return undefined;
 }
 
+function isMonthlyMimoAgentRef(raw: string | undefined, resolved: string) {
+  const normalized = raw?.trim().toLowerCase();
+  return (
+    resolved === MIMO_MONTH_AGENT_KEY ||
+    normalized === "fullstack" ||
+    normalized === "full-stack" ||
+    normalized === "nolo-fullstack" ||
+    normalized === "包月mimo" ||
+    normalized === "包月mimo2.5" ||
+    normalized === "mimo-month" ||
+    normalized === "全栈" ||
+    normalized === "nolo 全栈工程师"
+  );
+}
+
 function parseNonNegativeInteger(value: string | undefined) {
   if (!value) return undefined;
   const parsed = Number(value);
@@ -123,7 +130,6 @@ function positionalArgs(args: string[]) {
     "--server",
     "--auto",
     "--dangerously-allow-shell",
-    "--worktree-task",
     "--trace-tools",
     "--bg",
     "--no-stream",
@@ -146,7 +152,8 @@ export function parseAgentRunArgs(
   args: string[],
   options: ParseAgentRunArgsOptions = {}
 ): ParsedAgentRunArgs | null {
-  const agentKey = readFlagValue(args, "--agent") ?? positionalArgs(args)[0];
+  const rawAgentKey = readFlagValue(args, "--agent") ?? positionalArgs(args)[0];
+  const agentKey = rawAgentKey ? resolveCliAgentKeyInput(rawAgentKey) : undefined;
   const explicitMsg = readFlagValue(args, "--msg");
   const msgFile = readFlagValue(args, "--msg-file");
   const fileMessage = msgFile
@@ -178,7 +185,8 @@ export function parseAgentRunArgs(
     ...readRepeatedFlagValues(args, "--image"),
     ...readRepeatedFlagValues(args, "--image-url"),
   ];
-  const useTaskWorktree = args.includes("--worktree-task");
+  const mimoLocalWorkspaceDefault =
+    isMonthlyMimoAgentRef(rawAgentKey, agentKey) && runtimeMode !== "server";
   const workflowRef = readFlagValue(args, "--workflow");
   const taskRowDbKey = readFlagValue(args, "--task-row-dbkey");
   const artifactIds = readFlagValue(args, "--artifact-ids")
@@ -186,12 +194,12 @@ export function parseAgentRunArgs(
     .map((item) => item.trim())
     .filter(Boolean);
   return {
-    agentKey: resolveCliAgentKeyInput(agentKey),
+    agentKey,
     message,
     imageUrls,
-    allowShell: args.includes("--dangerously-allow-shell"),
+    allowShell: args.includes("--dangerously-allow-shell") || mimoLocalWorkspaceDefault,
     traceTools: args.includes("--trace-tools"),
-    useTaskWorktree,
+    injectFeatureWorktreeInstruction: mimoLocalWorkspaceDefault,
     ...(workflowRef ? { workflowRef } : {}),
     ...(taskRowDbKey
       ? {
@@ -203,7 +211,11 @@ export function parseAgentRunArgs(
           },
         }
       : {}),
-    ...(runtimeMode ? { runtimeMode } : useTaskWorktree ? { runtimeMode: "local" as const } : {}),
+    ...(runtimeMode
+      ? { runtimeMode }
+      : mimoLocalWorkspaceDefault || args.includes("--dangerously-allow-shell")
+        ? { runtimeMode: "local" as const }
+        : {}),
     background: args.includes("--bg"),
     noStream: args.includes("--no-stream"),
     noDefaultTestRoot,
@@ -269,6 +281,20 @@ export function prependWorkflowReferencePrompt(message: string, workflow?: Resol
   ].join("\n");
 }
 
+function prependFeatureWorktreeInstruction(message: string, enabled: boolean) {
+  if (!enabled) return message;
+  return [
+    "Local execution rule:",
+    "- You are running in the current git checkout with shell access.",
+    "- For read-only checks, smoke tests, or answering questions, stay in the current directory.",
+    "- Before developing a new feature or making non-trivial code changes, create a separate git worktree yourself with git worktree and do the edits there.",
+    "- Commit and push only when the user explicitly asks or the task requires it.",
+    "",
+    "User task:",
+    message,
+  ].join("\n");
+}
+
 function parseDialogReference(rawInput: string) {
   const normalized = rawInput.trim();
   if (normalized.startsWith("dialog-")) {
@@ -381,19 +407,13 @@ function resolveServerUrl(env: EnvLike) {
   return (env.NOLO_SERVER || env.BASE_URL || DEFAULT_NOLO_SERVER_URL).replace(/\/+$/, "");
 }
 
-function shouldPrepareTaskWorktree(parsed: ParsedAgentRunArgs) {
-  return !parsed.cwd && (parsed.useTaskWorktree || parsed.allowShell);
-}
-
-function buildTaskWorktreeEnv(args: {
+function buildLocalRunEnv(args: {
   env: EnvLike;
-  worktreePath?: string;
   allowShell: boolean;
 }) {
   return {
     ...args.env,
     ...(args.allowShell ? { NOLO_LOCAL_SHELL_MODE: "worktree" } : {}),
-    ...(args.worktreePath ? { NOLO_LOCAL_WORKTREE: args.worktreePath } : {}),
   };
 }
 
@@ -426,52 +446,24 @@ export async function runAgentRunCommand(args: string[], deps: AgentRunCommandDe
     }
   }
   let localRuntimeCwd = parsed.cwd;
-  if (shouldPrepareTaskWorktree(parsed)) {
-    try {
-      const preparedWorktree = await (deps.prepareTaskWorktree ?? prepareTaskWorktree)({
-        agentKey: parsed.agentKey,
-        env,
-      });
-      localRuntimeCwd = preparedWorktree.path;
-      output.write(formatPreparedTaskWorktree(preparedWorktree));
-    } catch (error) {
-      output.write(
-        "[nolo] Could not prepare a local task worktree.\n" +
-          "Run from inside a git repository, or set NOLO_LOCAL_WORKTREE to an existing isolated checkout.\n" +
-          `Reason: ${error instanceof Error ? error.message : String(error)}\n`
-      );
-      return 1;
-    }
+  if (!localRuntimeCwd && parsed.runtimeMode === "local") {
+    localRuntimeCwd = process.cwd();
   }
-  const shouldBindLocalWorkspace =
-    !!localRuntimeCwd &&
-    (parsed.runtimeMode === "local" || parsed.allowShell || parsed.useTaskWorktree);
-  if (shouldBindLocalWorkspace) {
-    try {
-      await (deps.ensureWorkspacePackageLinks ?? ensureWorkspacePackageLinks)(
-        localRuntimeCwd!
-      );
-    } catch (error) {
-      output.write(
-        "[nolo] Dependency preflight failed for local task worktree.\n" +
-          "The worktree may have node_modules entries that point outside the task checkout, or paths that cannot be repaired safely.\n" +
-          `Reason: ${error instanceof Error ? error.message : String(error)}\n`
-      );
-      return 1;
-    }
-  }
-  const runEnv = shouldBindLocalWorkspace
-    ? buildTaskWorktreeEnv({
-        env,
-        worktreePath: localRuntimeCwd,
-        allowShell: parsed.allowShell,
-      })
-    : env;
+  const runEnv = buildLocalRunEnv({
+    env,
+    allowShell: parsed.allowShell,
+  });
   const result: RunAgentTurnResult = await runner({
     agentName: parsed.agentKey,
     agentKey: parsed.agentKey,
     serverUrl: resolveServerUrl(env),
-    message: prependWorkflowReferencePrompt(parsed.message, workflowReference),
+    message: prependWorkflowReferencePrompt(
+      prependFeatureWorktreeInstruction(
+        parsed.message,
+        parsed.injectFeatureWorktreeInstruction
+      ),
+      workflowReference
+    ),
     imageUrls: parsed.imageUrls.map(normalizeCliImageInput),
     scriptDir: deps.scriptDir,
     env: runEnv,

package/agentRuntimeLocal.ts

@@ -5,12 +5,9 @@ export {
   hasDirectOpenAiCompatibleProvider,
   createHybridRecordStore,
   executeLocalToolWithPolicy,
-  activateWorkspaceSession,
-  createWorkspaceSession,
   buildAgentRuntimeAgentLookupKeys,
   buildAgentRuntimeDialogWritePlan,
   dialogMessageRecordToAgentRuntimeMessage,
-  formatWorkspaceSessionActivation,
   pickAgentRuntimeInferenceOptions,
   parseOpenAiCompatibleChatCompletionResponse,
   parsePlatformChatCompletionData,
@@ -44,8 +41,4 @@ export type {
   HybridRecordKvDb,
   HybridRecordStore,
   LocalToolPolicyDecision,
-  PreparedTaskWorkspace,
-  PrepareTaskWorkspace,
-  WorkspaceSession,
-  WorkspaceSessionMode,
 } from "./agent-runtime";

package/chat/messages/fetchMessages.ts

@@ -0,0 +1,84 @@
+// chat/messages/fetchMessages.ts
+import type { Message } from "./types"; // 确保引入你的 Message 类型定义
+import { isTombstoneRecord } from "../../database/tombstones";
+
+// 定义返回类型，包含数据库的 key
+export type MessageWithKey = Message & { _key: string };
+
+/**
+ * 获取指定对话的消息，支持分页加载。
+ * @param db 数据库实例。
+ * @param dialogId 对话 ID。
+ * @param options 配置选项 (limit?, beforeKey?, throwOnError?)。
+ * @returns Promise<MessageWithKey[]> 消息数组 (带 key, 默认最新在前)。
+ */
+export const fetchMessages = async (
+  db: any, // TODO: 替换为具体的数据库实例类型
+  dialogId: string,
+  options: {
+    limit?: number;
+    beforeKey?: string | null;
+    throwOnError?: boolean;
+    includeDeleted?: boolean;
+  } = {}
+): Promise<MessageWithKey[]> => {
+  const { limit = 30, beforeKey = null, throwOnError = false, includeDeleted = false } = options; // 分页默认 limit 30
+
+  // --- 输入验证 ---
+  if (!dialogId || typeof dialogId !== "string") {
+    const errorMsg = "fetchMessages: dialogId 必须是一个非空字符串";
+    if (throwOnError) throw new Error(errorMsg);
+    console.error(errorMsg);
+    return [];
+  }
+  // 其他验证 (limit, beforeKey) 可以根据需要添加
+
+  // --- 准备查询 ---
+  const messages: MessageWithKey[] = [];
+  const prefix = `dialog-${dialogId}-msg-`;
+
+  const iteratorOptions: any = {
+    // TODO: 替换为具体的迭代器选项类型
+    gte: prefix,
+    reverse: true, // 总是从新到旧获取
+    limit: limit,
+  };
+
+  if (beforeKey) {
+    // 加载更早的消息: Key < beforeKey
+    iteratorOptions.lt = beforeKey;
+  } else {
+    // 加载最新的消息: Key <= prefix + '\uffff'
+    iteratorOptions.lte = prefix + "\uffff";
+  }
+
+  // --- 执行查询 ---
+  try {
+    let iterator = db.iterator(iteratorOptions);
+    // 处理 react-native-leveldb 可能返回 Promise 的情况
+    if (iterator && typeof iterator.then === 'function') {
+      iterator = await iterator;
+    }
+
+
+    let count = 0;
+    for await (const [key, value] of iterator) {
+      count++;
+      if (!includeDeleted && isTombstoneRecord(value)) {
+        continue;
+      }
+      // 基本数据校验
+      if (value && typeof value === "object" && value.id && value.createdAt) {
+        // **关键: 将数据库 key 作为 _key 附加到消息对象上**
+        messages.push({ ...(value as Message), _key: key });
+      }
+    }
+
+
+    return messages; // 返回的消息数组是 newest first
+  } catch (error) {
+    console.error(`fetchMessages: 获取对话 ${dialogId} 消息失败:`, error);
+    if (throwOnError) throw error;
+    return [];
+  }
+};

package/chat/messages/types.ts

@@ -0,0 +1,185 @@
+// 文件路径: chat/messages/types.ts
+
+// ========== 角色 ==========
+export type MessageRole = "user" | "system" | "assistant" | "tool";
+
+// ========== OpenAI 风格的 content ==========
+export type OpenAIImageUrl =
+  | `http${string}`
+  | `https${string}`
+  | `data:image/${string};base64,${string}`;
+
+export interface OpenAIImageContent {
+  type: "image_url";
+  image_url: {
+    url: OpenAIImageUrl;
+    detail?: "low" | "high" | "auto";
+  };
+  google_native?: {
+    inlineData: {
+      mimeType: string;
+      data: string;
+    };
+    thoughtSignature?: string;
+  };
+}
+
+export interface OpenAITextContent {
+  type: "text";
+  text: string;
+}
+
+export type MessageContentPart = OpenAITextContent | OpenAIImageContent;
+
+export type CompletionFinishReason = "stop" | "tool_calls" | "length" | "content_filter" | null;
+
+// ========== Token Usage ==========
+export interface CompletionUsage {
+  completion_tokens: number;
+  prompt_tokens: number;
+  total_tokens: number;
+  cost?: number; // OpenRouter extension
+  prompt_tokens_details?: Record<string, any>;
+  completion_tokens_details?: Record<string, any>;
+  cost_details?: Record<string, any>;
+}
+
+export type Content = string | MessageContentPart[];
+
+export interface ImageGenerationState {
+  kind: "image_generation";
+  stage: "submitted" | "generating" | "saving";
+  startedAt: number;
+  waitHint?: string;
+  profileLabel?: string;
+}
+
+// ========== 消息级 UI 选项（Agent 菜单 / 快速回复 等） ==========
+
+export type UiOptionSource = "agent_menu" | "llm" | "system" | "tool";
+
+export interface UiOptionMeta {
+  /** 选项来源：Agent 配置 / LLM 建议 / 系统内置 / Tool 生成 */
+  source?: UiOptionSource;
+  /** 可选描述：用于 tooltip 或 hover 展示的详细说明 */
+  description?: string;
+}
+
+/**
+ * 一条消息下方的可点击选项（Agent 菜单 / quick reply / Tool 提示等）
+ * - 显示给用户的是 label
+ * - 发给 LLM 的是 userMessage（如果不写则使用 label）
+ */
+export interface UiOption {
+  /** 选项自身的稳定 ID（和 message.id 不同） */
+  id: string;
+  /** 按钮上的文案（用户可见） */
+  label: string;
+  /** 点击后要发给 LLM 的“等价人话”，不填则默认用 label */
+  userMessage?: string;
+  /** 附加元信息（目前轻量使用，后续可以扩展） */
+  meta?: UiOptionMeta;
+}
+
+// ========== Tool 调用快照 ==========
+
+export interface ToolErrorPayload {
+  type: string;
+  message: string;
+  code?: string;
+  retryable?: boolean;
+}
+
+export interface ToolPayload {
+  toolName: string;
+  status: "pending" | "running" | "succeeded" | "failed";
+  input: any;
+  rawToolCall?: any;
+
+  /**
+   * ✅ 工具输出不在 toolPayload 存储（唯一输出来源是 message.content）
+   * rawResult 不再写入；这里不保留兼容字段，按你的要求直接干掉。
+   */
+
+  error?: ToolErrorPayload;
+  toolRunId?: string;
+  startedAt?: number;
+  finishedAt?: number;
+
+  /**
+   * ✅ 持久化摘要：用于 ToolMessageItem header 展示
+   * 没有的话 UI 会 fallback 默认文案
+   */
+  summary?: string;
+
+  /**
+   * 提供给下一轮 LLM 的结构化上下文补充。
+   * 典型场景：工具真实产物（如 fileId / 可复用 URL）不能只靠 summary 传达。
+   * UI 不直接展示它，避免把 header 摘要污染成长文本。
+   */
+  llmContext?: string;
+
+  /**
+   * callAgent 子任务完成后产生的独立 dialog ID
+   * 供 UI 渲染「查看完整对话 →」跳转链接
+   */
+  subDialogId?: string;
+
+  /**
+   * 可选（未来建议）：toolVersion / executorVersion，用于严格复现
+   * toolVersion?: string;
+   */
+}
+
+// ========== Message 主类型 ==========
+
+export interface Message {
+  role: MessageRole;
+  content: Content;
+
+  thinkContent?: string;
+  image?: string;
+  images?: string[];
+
+  id: string;
+  dbKey: string;
+
+  cybotId?: string;
+  cybotKey?: string;
+  agentKey?: string;
+  agentName?: string;
+
+  isStreaming?: boolean;
+  imageGenerationState?: ImageGenerationState;
+  userId?: string;
+  usage?: any;
+
+  controller?: AbortController;
+
+  // ========= Tool 扩展字段 =========
+
+  toolName?: string;
+  toolPayload?: ToolPayload;
+  parentMessageId?: string;
+  toolRunId?: string;
+  parallelSessionId?: string;
+  parallelBranchId?: string;
+  parallelLabel?: string;
+  parallelIndex?: number;
+
+  // tool_call_id：关联 assistant message 的 tool_calls[].id
+  toolCallId?: string;
+
+  // assistant message 的 tool_calls（OpenAI 标准字段名）
+  tool_calls?: Array<{
+    id: string;
+    type: "function";
+    function: {
+      name: string;
+      arguments: string;
+    };
+  }>;
+
+  // ========= 消息级 UI 选项（Agent 菜单 / quick reply） =========
+  options?: UiOption[];
+}

package/cli/agentAliases.ts

@@ -1,4 +1,6 @@
 export const PLATFORM_DEMO_USER_ID = "b2e06f801f";
+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}`;
@@ -19,6 +21,10 @@ export const MIMO_MONTH_AGENT_KEY =
   `agent-0e95801d90-${MIMO_MONTH_AGENT_ID}`;
 
 const AGENT_ALIAS_TO_KEY: Record<string, string> = {
+  nolo: NOLO_DEFAULT_AGENT_KEY,
+  default: NOLO_DEFAULT_AGENT_KEY,
+  "default-nolo": NOLO_DEFAULT_AGENT_KEY,
+
   // Win Codex (高智力终审与架构把关)
   "win-codex": WIN_CODEX_AGENT_KEY,
   "wincodex": WIN_CODEX_AGENT_KEY,