@docyrus/docyrus 0.0.71 → 0.0.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docyrus/docyrus",
-  "version": "0.0.71",
+  "version": "0.0.73",
   "private": false,
   "description": "Docyrus API CLI",
   "main": "./main.js",

package/server-loader.js

@@ -18625,6 +18625,7 @@ var import_picocolors2 = __toESM(require_picocolors());
 // src/agent/envStore.ts
 var import_promises = require("node:fs/promises");
 var import_node_path = require("node:path");
+var LEGACY_AZURE_OPENAI_DEFAULT_API_VERSION = "2025-04-01-preview";
 function createDefaultState() {
   return {
     version: 1,
@@ -18639,6 +18640,9 @@ function normalizeState(state) {
     if (!normalizedKey || !normalizedValue) {
       continue;
     }
+    if (normalizedKey === "AZURE_OPENAI_API_VERSION" && normalizedValue === LEGACY_AZURE_OPENAI_DEFAULT_API_VERSION) {
+      continue;
+    }
     values[normalizedKey] = normalizedValue;
   }
   return {
@@ -43164,8 +43168,7 @@ function getProviderFormFields(params) {
           name: "apiVersion",
           title: "API version",
           component: "text",
-          defaultValue: "2025-04-01-preview",
-          placeholder: "2025-04-01-preview"
+          placeholder: "Leave blank to use pi default (v1)"
         }
       ];
     case "amazon-bedrock":
@@ -45366,88 +45369,11 @@ async function createAgentServer(params) {
       modelIdsByProvider: getModelIdsByProvider()
     });
   }
-  app.use("/*", cors({ origin: "*" }));
-  app.use("/*", async (c, next) => {
-    const unauthorizedResponse = authorizeServerRequest(c.req.raw, authToken);
-    if (unauthorizedResponse) {
-      return unauthorizedResponse;
-    }
-    await next();
-  });
-  app.get("/api/health", (c) => {
-    return c.json({ ok: true });
-  });
-  app.get("/api/status", (c) => {
-    return c.json({
-      isStreaming: activeSession.isStreaming,
-      model: activeSession.model ? { provider: activeSession.model.provider, id: activeSession.model.id } : null,
-      mode: sessionMode
-    });
-  });
-  app.post("/api/chat", async (c) => {
-    const body2 = await c.req.json();
-    const messages = body2.messages ?? [];
-    if (body2.sessionId && body2.sessionId.trim() !== activeSession.id?.trim()) {
-      try {
-        activeSession = await onResumeSession(body2.sessionId);
-        sessionMode = "normal";
-      } catch (error48) {
-        const msg = error48 instanceof Error ? error48.message : String(error48);
-        return c.json({ error: `Failed to resume session: ${msg}` }, 400);
-      }
-    }
-    const chatUnavailableReason = getChatUnavailableReason({ session: activeSession });
-    if (chatUnavailableReason) {
-      return c.json({ error: chatUnavailableReason }, 409);
-    }
-    const sessionId = body2.sessionId?.trim() || activeSession.id?.trim() || "active";
-    const askUserResponse = extractAskUserToolResponse(messages);
-    const pendingAskUser = pendingAskUserRequests.get(sessionId);
-    const userMessage = askUserResponse ? pendingAskUser && pendingAskUser.toolCallId === askUserResponse.toolCallId ? formatAskUserResponsePrompt(askUserResponse.response) : void 0 : extractLastUserText(messages);
-    if (!userMessage) {
-      return c.json({
-        error: askUserResponse ? "No matching pending ask_user request found" : "No user message found"
-      }, 400);
-    }
-    if (askUserResponse) {
-      pendingAskUserRequests.delete(sessionId);
-    }
-    let promptText = userMessage;
-    if (!askUserResponse) {
-      const modeCmd = parseModeSlashCommand(userMessage);
-      if (modeCmd) {
-        if (activeSession.isStreaming) {
-          await activeSession.abort();
-          await waitForIdle(activeSession);
-        }
-        await activeSession.prompt(`/${modeCmd.command}`);
-        sessionMode = SESSION_MODE_COMMANDS[modeCmd.command] ?? sessionMode;
-        if (!modeCmd.remainder) {
-          const notifEncoder = new TextEncoder();
-          const notifMessageId = generateMessageId();
-          return c.body(
-            makeModeNotificationStream({ command: modeCmd.command, messageId: notifMessageId, encoder: notifEncoder }),
-            {
-              headers: {
-                "Content-Type": "text/event-stream",
-                "Cache-Control": "no-cache",
-                "Connection": "keep-alive",
-                "x-vercel-ai-ui-message-stream": "v1"
-              }
-            }
-          );
-        }
-        promptText = modeCmd.remainder;
-      }
-    }
-    if (activeSession.isStreaming) {
-      await activeSession.abort();
-      await waitForIdle(activeSession);
-    }
+  function createPromptStreamResponse(promptText, sessionId) {
     const messageId = generateMessageId();
     const encoder = new TextEncoder();
     const stream = new ReadableStream({
-      start(controller) {
+      async start(controller) {
         let closed = false;
         function writeChunk(chunk) {
           if (closed) {
@@ -45471,6 +45397,10 @@ async function createAgentServer(params) {
           } catch {
           }
         }
+        if (activeSession.isStreaming) {
+          await activeSession.abort();
+          await waitForIdle(activeSession);
+        }
         writeChunk({ type: "start" });
         writeChunk({ type: "start-step" });
         let extensionUICleanup;
@@ -45550,7 +45480,7 @@ async function createAgentServer(params) {
         });
       }
     });
-    return c.body(stream, {
+    return new Response(stream, {
       headers: {
         "Content-Type": "text/event-stream",
         "Cache-Control": "no-cache",
@@ -45558,6 +45488,119 @@ async function createAgentServer(params) {
         "x-vercel-ai-ui-message-stream": "v1"
       }
     });
+  }
+  app.use("/*", cors({ origin: "*" }));
+  app.use("/*", async (c, next) => {
+    const unauthorizedResponse = authorizeServerRequest(c.req.raw, authToken);
+    if (unauthorizedResponse) {
+      return unauthorizedResponse;
+    }
+    await next();
+  });
+  app.get("/api/health", (c) => {
+    return c.json({ ok: true });
+  });
+  app.get("/api/status", (c) => {
+    return c.json({
+      isStreaming: activeSession.isStreaming,
+      model: activeSession.model ? { provider: activeSession.model.provider, id: activeSession.model.id } : null,
+      mode: sessionMode
+    });
+  });
+  app.post("/api/chat", async (c) => {
+    const body2 = await c.req.json();
+    const messages = body2.messages ?? [];
+    if (body2.sessionId && body2.sessionId.trim() !== activeSession.id?.trim()) {
+      try {
+        activeSession = await onResumeSession(body2.sessionId);
+        sessionMode = "normal";
+      } catch (error48) {
+        const msg = error48 instanceof Error ? error48.message : String(error48);
+        return c.json({ error: `Failed to resume session: ${msg}` }, 400);
+      }
+    }
+    const chatUnavailableReason = getChatUnavailableReason({ session: activeSession });
+    if (chatUnavailableReason) {
+      return c.json({ error: chatUnavailableReason }, 409);
+    }
+    const sessionId = body2.sessionId?.trim() || activeSession.id?.trim() || "active";
+    const askUserResponse = extractAskUserToolResponse(messages);
+    const pendingAskUser = pendingAskUserRequests.get(sessionId);
+    const userMessage = askUserResponse ? pendingAskUser && pendingAskUser.toolCallId === askUserResponse.toolCallId ? formatAskUserResponsePrompt(askUserResponse.response) : void 0 : extractLastUserText(messages);
+    if (!userMessage) {
+      return c.json({
+        error: askUserResponse ? "No matching pending ask_user request found" : "No user message found"
+      }, 400);
+    }
+    if (askUserResponse) {
+      pendingAskUserRequests.delete(sessionId);
+    }
+    let promptText = userMessage;
+    if (!askUserResponse) {
+      const modeCmd = parseModeSlashCommand(userMessage);
+      if (modeCmd) {
+        if (activeSession.isStreaming) {
+          await activeSession.abort();
+          await waitForIdle(activeSession);
+        }
+        await activeSession.prompt(`/${modeCmd.command}`);
+        sessionMode = SESSION_MODE_COMMANDS[modeCmd.command] ?? sessionMode;
+        if (!modeCmd.remainder) {
+          const notifEncoder = new TextEncoder();
+          const notifMessageId = generateMessageId();
+          return c.body(
+            makeModeNotificationStream({ command: modeCmd.command, messageId: notifMessageId, encoder: notifEncoder }),
+            {
+              headers: {
+                "Content-Type": "text/event-stream",
+                "Cache-Control": "no-cache",
+                "Connection": "keep-alive",
+                "x-vercel-ai-ui-message-stream": "v1"
+              }
+            }
+          );
+        }
+        promptText = modeCmd.remainder;
+      }
+    }
+    return createPromptStreamResponse(promptText, sessionId);
+  });
+  app.post("/api/chat/retry", async (c) => {
+    const body2 = await c.req.json().catch(() => ({}));
+    if (body2.sessionId && body2.sessionId.trim() !== activeSession.id?.trim()) {
+      try {
+        activeSession = await onResumeSession(body2.sessionId);
+        sessionMode = "normal";
+      } catch (error48) {
+        const msg = error48 instanceof Error ? error48.message : String(error48);
+        return c.json({ error: `Failed to resume session: ${msg}` }, 400);
+      }
+    }
+    const chatUnavailableReason = getChatUnavailableReason({ session: activeSession });
+    if (chatUnavailableReason) {
+      return c.json({ error: chatUnavailableReason }, 409);
+    }
+    const userMessages = activeSession.getUserMessagesForForking();
+    const lastUserMessage = userMessages[userMessages.length - 1];
+    if (!lastUserMessage) {
+      return c.json({ error: "Session has no user message to retry" }, 404);
+    }
+    if (activeSession.isStreaming) {
+      await activeSession.abort();
+      await waitForIdle(activeSession);
+    }
+    try {
+      const navigation = await activeSession.navigateTree(lastUserMessage.entryId);
+      if (navigation.cancelled) {
+        return c.json({ error: "Retry cancelled by session" }, 409);
+      }
+    } catch (error48) {
+      const msg = error48 instanceof Error ? error48.message : String(error48);
+      return c.json({ error: `Failed to rewind session for retry: ${msg}` }, 500);
+    }
+    const sessionId = body2.sessionId?.trim() || activeSession.id?.trim() || "active";
+    pendingAskUserRequests.delete(sessionId);
+    return createPromptStreamResponse(lastUserMessage.text, sessionId);
   });
   app.post("/api/chat/abort", async (c) => {
     if (!activeSession.isStreaming) {
@@ -47406,6 +47449,8 @@ async function createAgentServer(params) {
 
 `);
     process.stderr.write(`  POST /api/chat                          \u2014 send chat messages (SSE UIMessage stream)
+`);
+    process.stderr.write(`  POST /api/chat/retry                    \u2014 retry the last user message after an error
 `);
     process.stderr.write(`  POST /api/chat/abort                    \u2014 abort active chat stream
 `);
@@ -47651,6 +47696,12 @@ var SERVER_MODE_ALLOWED_MODEL_IDS_BY_PROVIDER = {
   minimax: [
     "MiniMax-M2.7",
     "MiniMax-M2.7-highspeed"
+  ],
+  moonshotai: [
+    "kimi-k2.6"
+  ],
+  deepseek: [
+    "deepseek-v4-pro"
   ]
 };
 var ALLOWED_MODEL_IDS_BY_PROVIDER = Object.fromEntries(
@@ -47735,6 +47786,17 @@ function createServerSessionAdapter(params) {
     listCommands() {
       const getCommands = params.extensionsResult.runtime.getCommands;
       return typeof getCommands === "function" ? getCommands() : [];
+    },
+    getUserMessagesForForking() {
+      const fn = params.session.getUserMessagesForForking;
+      return typeof fn === "function" ? fn.call(params.session) : [];
+    },
+    navigateTree(targetId, options) {
+      const fn = params.session.navigateTree;
+      if (typeof fn !== "function") {
+        return Promise.resolve({ cancelled: true });
+      }
+      return fn.call(params.session, targetId, options);
     }
   };
 }