oasis_test_v2 2.2.51 → 2.2.52

package/dist/index.js

@@ -1418,6 +1418,19 @@ function windowMessagesByTurns(messages, turns) {
   }
   return { messages, hasMoreBefore: false };
 }
+function isChatHistoryMessage(m2) {
+  if (m2.role === "system") return m2.needsAgentDelivery === true;
+  return !(m2.role === "assistant" && m2.status === "running");
+}
+function pageChatHistory(messages, query) {
+  const needle = query.search?.trim().toLowerCase();
+  const matched = messages.filter((m2) => isChatHistoryMessage(m2) && (query.beforeSeq === void 0 || m2.seq < query.beforeSeq) && (!needle || m2.content.toLowerCase().includes(needle)));
+  const limit = Math.max(0, query.limit);
+  return {
+    messages: limit > 0 ? matched.slice(-limit) : [],
+    hasMoreBefore: matched.length > limit
+  };
+}
 var CHAT_MODEL_OVERRIDE_RUNTIMES, systemMessageSourceKey, deriveSystemMessageKey, deriveSystemMessageId, CHAT_SUBMIT_KEY_PREFIX, chatSubmitMessageKey, clientSubmitIdFromMessageKey, optimisticUserItemId;
 var init_chat_session = __esm({
   "../contract/src/chat-session.ts"() {
@@ -167040,6 +167053,9 @@ function renderPendingBroadcasts(items) {
     return `${i + 1}. ${body2}${b2.at ? `\uFF08${b2.at}\uFF09` : ""}`;
   });
   if (folded > 0) lines.push(`\uFF08\u53E6\u6709 ${folded} \u9879\u66F4\u65E9\u7684\u901A\u544A\u672A\u5C55\u5F00\uFF09`);
+  if (folded > 0 || detailed.some((b2) => b2.text.length > BROADCAST_TEXT_LIMIT)) {
+    lines.push("\uFF08\u672A\u5C55\u5F00\u6216\u622A\u65AD\u7684\u901A\u544A\u5168\u6587\uFF0C\u9700\u8981\u65F6\u53EF\u4EE5\u7528 `oasis chat-history --search <\u5173\u952E\u8BCD>` \u67E5\uFF09");
+  }
   return [
     "\u3010\u4EE5\u4E0B\u662F\u8FD9\u4E2A\u5BF9\u8BDD\u91CC\u53D1\u8D77\u7684\u4E8B\u60C5\u7684\u6700\u65B0\u8FDB\u5C55\uFF0C\u4F60\u4E4B\u524D\u6CA1\u770B\u5230\u8FC7\uFF1B\u7528\u6237\u5DF2\u7ECF\u5728\u754C\u9762\u4E0A\u770B\u5230\u4E86\u8FD9\u51E0\u6761\u72B6\u6001\u3011",
     ...lines,
@@ -167064,12 +167080,18 @@ function renderPendingUserMessages(items) {
     ""
   ].join("\n");
 }
+function renderHistoryHint(count2, hint) {
+  return `\uFF08\u4EE5\u4E0A\u662F\u8FD9\u6BB5\u5BF9\u8BDD\u6700\u8FD1\u7684 ${count2} \u6761\uFF0C\u66F4\u65E9\u7684\u6CA1\u6709\u5E26\u8FDB\u6765\u3002\u5982\u679C\u9700\u8981\u7684\u8BDD\uFF0C\u53EF\u4EE5\u8FD0\u884C \`oasis chat-history ${hint.sessionId} --before ${hint.beforeSeq}\` \u83B7\u53D6\u66F4\u65E9\u7684\u5BF9\u8BDD\uFF0C\u6216\u52A0 \`--search <\u5173\u952E\u8BCD>\` \u5728\u6574\u6BB5\u5BF9\u8BDD\u91CC\u641C\u7D22\u3002\uFF09`;
+}
 function buildRuntimeChatPrompt(input) {
   let prompt2 = input.userMessage;
   if (input.history?.length) {
     const history = input.history.map((message) => `${HISTORY_SPEAKER[message.role]}: ${message.content}`).join("\n\n");
+    const hint = input.historyHint ? `
+
+${renderHistoryHint(input.history.length, input.historyHint)}` : "";
     prompt2 = `${OPEN}
-${history}
+${history}${hint}
 ${CLOSE}
 
 ${prompt2}`;
@@ -167527,6 +167549,7 @@ ${body2}` : UNFINISHED_EMPTY;
 function toHistory(messages, excludeMessageKey) {
   return messages.filter((m2) => m2.role === "system" ? isDeliveredAgentNotice(m2) : !(m2.role === "assistant" && m2.status === "running")).filter((m2) => !excludeMessageKey || m2.messageKey !== excludeMessageKey).map((m2) => ({
     id: m2.id,
+    seq: m2.seq,
     role: m2.role,
     content: m2.role === "user" ? stripInjectedChatContext(m2.content) : m2.role === "system" ? m2.content : m2.status === "error" ? markUnfinishedAssistant(m2.content) : m2.content
   }));
@@ -167548,22 +167571,29 @@ async function planChatContinuation(input) {
     const trailing = input.excludeTrailingUserContent?.trim();
     const last = turns[turns.length - 1];
     if (trailing && last?.role === "user" && last.content.trim() === trailing) turns.pop();
-    return turns.slice(-limit);
+    const hasEarlier = rows.length >= limit * HISTORY_FETCH_SLACK || turns.length > limit;
+    return { turns: turns.slice(-limit), hasEarlier };
   };
-  const history = needsHistoryInjection ? await readHistory() : [];
+  const hintFor = (w2) => w2.hasEarlier && w2.turns.length ? { historyHint: { sessionId: session.id, beforeSeq: w2.turns[0].seq } } : {};
+  const NO_HISTORY = { turns: [], hasEarlier: false };
+  const historyWindow = needsHistoryInjection ? await readHistory() : NO_HISTORY;
+  const history = historyWindow.turns;
   const pendingBroadcasts = input.pendingBroadcasts?.length ? input.pendingBroadcasts : void 0;
   const persistedSystemNotices = input.persistedSystemNotices?.length ? input.persistedSystemNotices : void 0;
   const runtimeMessage = buildRuntimeChatPrompt({
     userMessage: input.userMessage,
     ...history.length ? { history: history.map(({ role, content: content3 }) => ({ role, content: content3 })) } : {},
+    ...hintFor(historyWindow),
     ...input.draftWorkspace ? { draftWorkspace: input.draftWorkspace } : {},
     ...pendingBroadcasts ? { pendingBroadcasts } : {},
     ...persistedSystemNotices ? { persistedSystemNotices } : {}
   });
-  const fallbackHistory = effectiveSessionId ? await readHistory() : [];
+  const fallbackWindow = effectiveSessionId ? await readHistory() : NO_HISTORY;
+  const fallbackHistory = fallbackWindow.turns;
   const fallbackMessage = fallbackHistory.length ? buildRuntimeChatPrompt({
     userMessage: input.userMessage,
     history: fallbackHistory.map(({ role, content: content3 }) => ({ role, content: content3 })),
+    ...hintFor(fallbackWindow),
     ...input.draftWorkspace ? { draftWorkspace: input.draftWorkspace } : {},
     // resume 扑空后的重派也要带上通告：那一轮才是真正送到 agent 的那一轮。
     ...pendingBroadcasts ? { pendingBroadcasts } : {},
@@ -240738,6 +240768,72 @@ var init_reply_anchors = __esm({
   }
 });
 
+// ../server/src/domains/chat-sessions/agent-history.ts
+async function resolveChatHistoryViewer(auth, getSession) {
+  if (isHumanActorId(auth.actor)) return { kind: "human", actor: auth.actor };
+  const currentSessionId = auth.dispatch?.chatSessionId;
+  if (!currentSessionId) return null;
+  const current = await getSession(currentSessionId);
+  if (!current || current.aiActorId !== auth.actor) return null;
+  return { kind: "agent", actor: auth.actor, humanActorId: current.humanActorId, currentSessionId };
+}
+function canReadChatHistory(viewer, session) {
+  if (viewer.kind === "human") return session.humanActorId === viewer.actor;
+  return session.aiActorId === viewer.actor && session.humanActorId === viewer.humanActorId;
+}
+function parseChatHistoryQuery(q2) {
+  const before = Number(q2?.get("beforeSeq") ?? "");
+  const limitRaw = Number(q2?.get("limit") ?? "");
+  const limit = Number.isFinite(limitRaw) && limitRaw > 0 ? Math.min(Math.floor(limitRaw), CHAT_HISTORY_MAX_LIMIT) : CHAT_HISTORY_DEFAULT_LIMIT;
+  const search2 = q2?.get("search")?.trim();
+  return {
+    ...Number.isFinite(before) && before > 0 ? { beforeSeq: Math.floor(before) } : {},
+    limit,
+    ...search2 ? { search: search2 } : {}
+  };
+}
+function toChatHistoryView(session, page) {
+  const messages = page.messages.map((m2) => {
+    const names = (m2.attachments ?? []).map((a) => a.name).filter(Boolean);
+    return {
+      id: m2.id,
+      seq: m2.seq,
+      role: m2.role,
+      content: m2.role === "user" ? stripInjectedChatContext(m2.content) : m2.role === "assistant" && m2.status === "error" ? markUnfinishedAssistant(m2.content) : m2.content,
+      createdAt: m2.createdAt,
+      ...names.length ? { attachments: names } : {}
+    };
+  });
+  return {
+    sessionId: session.id,
+    title: session.title,
+    messages,
+    hasMoreBefore: page.hasMoreBefore,
+    nextBeforeSeq: page.hasMoreBefore && messages.length ? messages[0].seq : null
+  };
+}
+function toChatHistorySessionList(viewer, sessions) {
+  return sessions.filter((s2) => s2.visibility !== "internal" && canReadChatHistory(viewer, s2)).sort((a, b2) => b2.touchedAt.localeCompare(a.touchedAt)).map((s2) => ({
+    id: s2.id,
+    title: s2.title,
+    createdAt: s2.createdAt,
+    touchedAt: s2.touchedAt,
+    projectId: s2.projectId ?? null,
+    current: viewer.kind === "agent" && s2.id === viewer.currentSessionId
+  }));
+}
+var CHAT_HISTORY_DEFAULT_LIMIT, CHAT_HISTORY_MAX_LIMIT;
+var init_agent_history = __esm({
+  "../server/src/domains/chat-sessions/agent-history.ts"() {
+    "use strict";
+    init_src();
+    init_continuation3();
+    init_injected_context();
+    CHAT_HISTORY_DEFAULT_LIMIT = 20;
+    CHAT_HISTORY_MAX_LIMIT = 100;
+  }
+});
+
 // ../server/src/domains/chat-sessions/project-bundle.ts
 async function buildChatProjectBundle(projectId2, projects, readBlob) {
   const project = await projects.getProject(projectId2);
@@ -241068,6 +241164,26 @@ function createChatSessionsDomain(opts) {
       await store2.createSession(session);
       return { status: 201, body: session };
     });
+    router.get("/api/chat-history", async (req) => {
+      const store2 = await storeFor(req);
+      const viewer = await resolveChatHistoryViewer(req.auth, (id) => store2.getSession(id));
+      if (!viewer) return { status: 200, body: { items: [] } };
+      const owner = viewer.kind === "human" ? viewer.actor : viewer.humanActorId;
+      return { status: 200, body: { items: toChatHistorySessionList(viewer, await store2.listSessions(owner)) } };
+    });
+    router.get("/api/chat-history/:id", async (req) => {
+      const store2 = await storeFor(req);
+      const [viewer, session] = await Promise.all([
+        resolveChatHistoryViewer(req.auth, (id) => store2.getSession(id)),
+        store2.getSession(req.params.id)
+      ]);
+      if (!viewer || !session || !canReadChatHistory(viewer, session)) {
+        throw new ApiError(404, "NOT_FOUND", "session not found");
+      }
+      const query = parseChatHistoryQuery(req.query);
+      const page = store2.listHistoryPage ? await store2.listHistoryPage(session.id, query) : pageChatHistory(await store2.listMessages(session.id), query);
+      return { status: 200, body: toChatHistoryView(session, page) };
+    });
     router.get("/api/chat-sessions/by-runtime/:rt", async (req) => {
       const store2 = await storeFor(req);
       const session = await store2.getSessionByRuntimeSessionId(req.params.rt);
@@ -241761,6 +241877,7 @@ var init_chat_sessions2 = __esm({
     init_service3();
     init_reply_anchors();
     init_injected_context();
+    init_agent_history();
     init_deletion();
     init_chat_turn_gate();
     init_company_data_store_router();
@@ -254675,6 +254792,35 @@ var init_postgres_chat_sessions = __esm({
         );
         return { messages: r.rows.map(rowToMessage), hasMoreBefore: older.rows.length > 0 };
       }
+      async listHistoryPage(sessionId, query) {
+        if (!await this.scopedSessionExists(sessionId)) return { messages: [], hasMoreBefore: false };
+        const limit = Math.max(0, Math.floor(query.limit));
+        if (limit === 0) return { messages: [], hasMoreBefore: false };
+        const args = [sessionId];
+        const where = [
+          "session_id = $1",
+          "(role <> 'system' OR needs_agent_delivery IS TRUE)",
+          "(role <> 'assistant' OR status IS DISTINCT FROM 'running')"
+        ];
+        if (query.beforeSeq !== void 0) {
+          args.push(query.beforeSeq);
+          where.push(`seq < $${args.length}`);
+        }
+        const needle = query.search?.trim();
+        if (needle) {
+          args.push(`%${needle.replace(/[\\%_]/g, (c) => `\\${c}`)}%`);
+          where.push(`content ILIKE $${args.length} ESCAPE '\\'`);
+        }
+        args.push(limit + 1);
+        const r = await this.pool.query(
+          `SELECT id, session_id, role, content, seq, created_at, run_id, turn_id, attachments, status, completed_at,
+              message_key, needs_agent_delivery, delivered_to_agent_at, delivery_route
+         FROM ${this.s}.chat_messages WHERE ${where.join(" AND ")} ORDER BY seq DESC LIMIT $${args.length}`,
+          args
+        );
+        const rows = r.rows.map(rowToMessage);
+        return { messages: rows.slice(0, limit).reverse(), hasMoreBefore: rows.length > limit };
+      }
       async listRunningAssistantMessages() {
         const r = await this.pool.query(
           `SELECT m.* FROM ${this.s}.chat_messages m
@@ -276134,6 +276280,24 @@ var COMMAND_DECLS = {
     ],
     examples: ["oasis mem-delete mem-abc"]
   },
+  "chat-history": {
+    group: "\u957F\u671F\u8BB0\u5FC6\uFF08ADR-0084/0102\uFF09",
+    usage: "oasis chat-history [<\u4F1A\u8BDDid>] [--before <seq>] [--limit <n>] [--search <\u5173\u952E\u8BCD>] | oasis chat-history --sessions",
+    description: "\u56DE\u8BFB\u5BF9\u8BDD\u5386\u53F2\uFF1A\u6362 runtime \u7EED\u8DD1\u65F6\u53EA\u5E26\u6700\u8FD1 20 \u6761\uFF0C\u66F4\u65E9\u7684\u7528\u5B83\u6309\u9700\u53D6\u3002\u7F3A\u7701\u8BFB\u5F53\u524D\u4F1A\u8BDD\uFF1B\u4E5F\u80FD\u8BFB\u4F60\u81EA\u5DF1\u548C\u540C\u4E00\u4E2A\u4EBA\u7684\u5176\u5B83\u4F1A\u8BDD\uFF08--sessions \u5217\u51FA\uFF09\u3002",
+    positional: [{ name: "[<\u4F1A\u8BDDid>]", required: false, desc: "\u4F1A\u8BDD id\uFF1B\u7F3A\u7701 = \u5F53\u524D\u4F1A\u8BDD\uFF08$OASIS_CHAT_SESSION_ID\uFF09" }],
+    flags: [
+      { name: "before", desc: "\u53EA\u770B seq \u5C0F\u4E8E\u5B83\u7684\uFF08\u5F80\u524D\u7FFB\u9875\uFF1B\u4E0A\u4E00\u9875\u672B\u5C3E\u4F1A\u7ED9\u51FA\u4E0B\u4E00\u9875\u7684\u547D\u4EE4\uFF09" },
+      { name: "limit", desc: "\u6761\u6570\uFF08\u9ED8\u8BA4 20\uFF0C\u4E0A\u9650 100\uFF09" },
+      { name: "search", desc: "\u6B63\u6587\u5173\u952E\u8BCD\uFF08\u4E0D\u533A\u5206\u5927\u5C0F\u5199\uFF09\uFF0C\u5728\u6574\u6BB5\u5BF9\u8BDD\u91CC\u641C" },
+      { name: "sessions", desc: "\u5217\u51FA\u4F60\u80FD\u56DE\u8BFB\u7684\u4F1A\u8BDD\uFF08id / \u6700\u8FD1\u6D3B\u52A8 / \u6807\u9898\uFF09", boolean: true }
+    ],
+    examples: [
+      "oasis chat-history --before 120",
+      "oasis chat-history --search \u4EFB\u52A1\u4E66",
+      "oasis chat-history --sessions",
+      "oasis chat-history 84f48795-1c2d-4e5f-8a9b-0c1d2e3f4a5b --limit 50"
+    ]
+  },
   // —— 生命周期 ——
   stale: {
     group: "\u751F\u547D\u5468\u671F",
@@ -277277,6 +277441,35 @@ var ApiRequestError = class extends Error {
     this.name = "ApiRequestError";
   }
 };
+var CHAT_HISTORY_SPEAKER = { user: "\u7528\u6237", assistant: "\u52A9\u624B", system: "\u7CFB\u7EDF" };
+function renderChatHistory(view, search2) {
+  const lines = [];
+  const scope2 = search2 ? `\u5339\u914D\u300C${search2}\u300D\u7684` : "";
+  if (view.messages.length === 0) {
+    lines.push(search2 ? `\u4F1A\u8BDD ${view.sessionId} \u91CC\u6CA1\u6709${scope2}\u6D88\u606F\u3002` : `\u4F1A\u8BDD ${view.sessionId} \u6CA1\u6709\u66F4\u65E9\u7684\u5BF9\u8BDD\u4E86\u3002`);
+    return lines.join("\n");
+  }
+  const first = view.messages[0].seq;
+  const last = view.messages[view.messages.length - 1].seq;
+  lines.push(`\u4F1A\u8BDD ${view.sessionId}${view.title ? `\u300C${view.title}\u300D` : ""}\uFF1A${scope2}${view.messages.length} \u6761\uFF08#${first}\u2013#${last}\uFF0C\u6309\u65F6\u95F4\u987A\u5E8F\uFF09`);
+  for (const m2 of view.messages) {
+    lines.push("", `\u2500\u2500 #${m2.seq} ${CHAT_HISTORY_SPEAKER[m2.role]} \xB7 ${m2.createdAt.slice(0, 16).replace("T", " ")}`);
+    if (m2.attachments?.length) lines.push(`\uFF08\u9644\u4EF6\uFF1A${m2.attachments.join("\u3001")}\uFF09`);
+    lines.push(m2.content);
+  }
+  lines.push("");
+  lines.push(view.nextBeforeSeq !== null ? `\u66F4\u65E9\u8FD8\u6709\uFF1Aoasis chat-history ${view.sessionId} --before ${view.nextBeforeSeq}${search2 ? ` --search ${JSON.stringify(search2)}` : ""}` : `\uFF08${scope2}\u5BF9\u8BDD\u5DF2\u7ECF\u5230\u5934\u4E86\uFF09`);
+  return lines.join("\n");
+}
+function renderChatHistorySessions(items) {
+  if (items.length === 0) return "\u6CA1\u6709\u53EF\u56DE\u8BFB\u7684\u4F1A\u8BDD\uFF08\u4E0D\u5728\u5BF9\u8BDD\u91CC\u8FD0\u884C\u65F6\uFF0Cagent \u8BFB\u4E0D\u5230\u4EFB\u4F55\u4F1A\u8BDD\uFF09\u3002";
+  return [
+    `\u53EF\u56DE\u8BFB\u7684\u4F1A\u8BDD ${items.length} \u6761\uFF08\u6700\u8FD1\u6D3B\u52A8\u5728\u524D\uFF09\uFF1A`,
+    ...items.map((s2) => `${s2.id}  ${s2.touchedAt.slice(0, 16).replace("T", " ")}  ${s2.title ?? "\uFF08\u65E0\u6807\u9898\uFF09"}${s2.current ? "  \u2190 \u5F53\u524D\u4F1A\u8BDD" : ""}`),
+    "",
+    "\u8BFB\u5176\u4E2D\u4E00\u6761\uFF1Aoasis chat-history <\u4F1A\u8BDDid>"
+  ].join("\n");
+}
 var ASYNC_AUTH_MESSAGE = "\u5DF2\u63D0\u4EA4\u4EBA\u5DE5\u5BA1\u6838\uFF1B\u5148\u53BB\u505A\u522B\u7684\uFF0C\u6CA1\u6709\u5C31\u6536\u5C3E\u2014\u2014\u6279\u51C6\u540E\u7CFB\u7EDF\u4F1A\u91CD\u65B0\u53EB\u4F60\u3002";
 function asyncAuthorizationReturn(data) {
   return data !== void 0 ? { message: ASYNC_AUTH_MESSAGE, data } : { message: ASYNC_AUTH_MESSAGE };
@@ -279365,6 +279558,28 @@ ${res.warning}`);
       }
       break;
     }
+    case "chat-history": {
+      if (flags.has("sessions")) {
+        const { items } = await api.request("GET", "/api/chat-history");
+        println(renderChatHistorySessions(items));
+        break;
+      }
+      const sid = positional[0] ?? process.env["OASIS_CHAT_SESSION_ID"];
+      if (!sid) throw new Error("\u7528\u6CD5\uFF1Aoasis chat-history [<\u4F1A\u8BDDid>] \u2014\u2014\u4E0D\u5728\u5BF9\u8BDD\u91CC\u8FD0\u884C\u65F6\u8981\u7ED9\u4F1A\u8BDD id\uFF08oasis chat-history --sessions \u53EF\u5217\u51FA\uFF09");
+      const qs = new URLSearchParams();
+      const before = flags.get("before");
+      const limit = flags.get("limit");
+      const search2 = flags.get("search");
+      if (before) qs.set("beforeSeq", before);
+      if (limit) qs.set("limit", limit);
+      if (search2) qs.set("search", search2);
+      const view = await api.request(
+        "GET",
+        `/api/chat-history/${encodeURIComponent(sid)}${qs.size ? `?${qs.toString()}` : ""}`
+      );
+      println(renderChatHistory(view, search2));
+      break;
+    }
     case "mem-delete": {
       const memId = needPos(positional, 0, "oasis mem-delete <memId>");
       await api.request("DELETE", `/api/actor-memory/${encodeURIComponent(memId)}`);
@@ -280911,7 +281126,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.51" : "dev";
+var PKG_VERSION = true ? "2.2.52" : "dev";
 var LOCAL_BIN = localBin();
 var NPM_PREFIX = npmPrefix();
 var INSTANCE = DEFAULT_INSTANCE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test_v2",
-  "version": "2.2.51",
+  "version": "2.2.52",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"
@@ -26,6 +26,6 @@
     "node": ">=20"
   },
   "oasisRelease": {
-    "sourceHead": "22692b1fcded16acb268204f9045ddb2bee49a8c"
+    "sourceHead": "947e60bf5ac5d7ade7d88ea73fc0dd6dcb8ecd96"
   }
 }