@yachiyo-5i/xlyra-agent 1.3.0 → 1.3.2

package/dist/cli.cjs

@@ -642,6 +642,7 @@ var EscalationRequiredError = class extends Error {
 };
 var EscalationGrants = class {
   grants = /* @__PURE__ */ new Map();
+  oneShotGrants = /* @__PURE__ */ new Map();
   /** 会话级完全访问开关（前端 permission_mode=full 注入；ask 时撤销，不随消息残留） */
   fullAccess = /* @__PURE__ */ new Set();
   /** 完全访问模式：跳过一切路径与能力提权检查（用户已在 UI 二次确认） */
@@ -666,24 +667,48 @@ var EscalationGrants = class {
   grantCapability(sessionId, capability) {
     this.grant(sessionId, capability);
   }
+  grantOnce(sessionId, resolvedPath) {
+    let set = this.oneShotGrants.get(sessionId);
+    if (!set) {
+      set = /* @__PURE__ */ new Set();
+      this.oneShotGrants.set(sessionId, set);
+    }
+    set.add(resolvedPath);
+  }
+  grantCapabilityOnce(sessionId, capability) {
+    this.grantOnce(sessionId, capability);
+  }
   /** 已授权路径或其子路径视为已放开；完全访问模式直接放行 */
   isGranted(sessionId, resolvedPath) {
     if (this.fullAccess.has(sessionId)) return true;
     const set = this.grants.get(sessionId);
-    if (!set) return false;
-    for (const prefix of set) {
-      const relative = import_node_path3.default.relative(prefix, resolvedPath);
-      if (relative === "" || !relative.startsWith("..") && !import_node_path3.default.isAbsolute(relative)) return true;
+    if (set) {
+      for (const prefix of set) {
+        const relative = import_node_path3.default.relative(prefix, resolvedPath);
+        if (relative === "" || !relative.startsWith("..") && !import_node_path3.default.isAbsolute(relative)) return true;
+      }
+    }
+    const oneShot = this.oneShotGrants.get(sessionId);
+    if (oneShot?.has(resolvedPath)) {
+      oneShot.delete(resolvedPath);
+      if (oneShot.size === 0) this.oneShotGrants.delete(sessionId);
+      return true;
     }
     return false;
   }
   isCapabilityGranted(sessionId, capability) {
     if (this.fullAccess.has(sessionId)) return true;
-    return this.grants.get(sessionId)?.has(capability) ?? false;
+    if (this.grants.get(sessionId)?.has(capability)) return true;
+    const oneShot = this.oneShotGrants.get(sessionId);
+    if (!oneShot?.has(capability)) return false;
+    oneShot.delete(capability);
+    if (oneShot.size === 0) this.oneShotGrants.delete(sessionId);
+    return true;
   }
   /** 会话删除时清掉授权（授权随会话生命周期） */
   drop(sessionId) {
     this.grants.delete(sessionId);
+    this.oneShotGrants.delete(sessionId);
     this.fullAccess.delete(sessionId);
   }
 };
@@ -4287,7 +4312,14 @@ function createAgentRoutes(ctx) {
       }
     );
     await recorder.begin(runId);
-    return { sessionId: args2.sessionId, messageId, runId };
+    const resolvedModel = ctx.resolver.resolve(args2.model).modelId;
+    return {
+      sessionId: args2.sessionId,
+      messageId,
+      runId,
+      model: resolvedModel,
+      agentInstanceId: args2.agentInstanceId ?? ctx.agentInstanceId ?? "default"
+    };
   }
   app.post("/sessions", async (c) => {
     const payload = startPayloadSchema.parse(await c.req.json());
@@ -4314,7 +4346,7 @@ function createAgentRoutes(ctx) {
     if (payload.permission_mode !== void 0) {
       ctx.grants.setFullAccess(sessionId, payload.permission_mode === "full");
     }
-    const { messageId, runId } = await launchUserMessage({
+    const { messageId, runId, model, agentInstanceId } = await launchUserMessage({
       sessionId,
       content: payload.content,
       model: payload.model,
@@ -4326,7 +4358,7 @@ function createAgentRoutes(ctx) {
       },
       ...payload.agent_instance_id ? { agentInstanceId: payload.agent_instance_id } : {}
     });
-    return c.json(ok({ session_id: sessionId, message_id: messageId, run_id: runId }, "\u7528\u6237\u6D88\u606F\u5DF2\u63D0\u4EA4"), 202);
+    return c.json(ok({ session_id: sessionId, message_id: messageId, run_id: runId, model, agent_instance_id: agentInstanceId }, "\u7528\u6237\u6D88\u606F\u5DF2\u63D0\u4EA4"), 202);
   });
   app.get("/sessions", (c) => {
     const limit = Math.min(Number(c.req.query("limit") ?? 50), 200);
@@ -4449,7 +4481,7 @@ function createAgentRoutes(ctx) {
     ctx.store.discardFromUserMessage(sessionId, payload.message_id);
     const history = ctx.store.buildHistory(sessionId);
     const remaining = ctx.store.read(sessionId).entries.length;
-    const { messageId, runId } = await launchUserMessage({
+    const { messageId, runId, model, agentInstanceId } = await launchUserMessage({
       sessionId,
       content,
       model: payload.model,
@@ -4462,7 +4494,7 @@ function createAgentRoutes(ctx) {
       },
       ...payload.agent_instance_id ? { agentInstanceId: payload.agent_instance_id } : {}
     });
-    return c.json(ok({ session_id: sessionId, message_id: messageId, run_id: runId }, "\u5DF2\u91CD\u65B0\u63D0\u4EA4"), 202);
+    return c.json(ok({ session_id: sessionId, message_id: messageId, run_id: runId, model, agent_instance_id: agentInstanceId }, "\u5DF2\u91CD\u65B0\u63D0\u4EA4"), 202);
   });
   app.post("/sessions/:id/grant-access", async (c) => {
     const sessionId = c.req.param("id");
@@ -4481,6 +4513,12 @@ function createAgentRoutes(ctx) {
     if (!esc || esc.type !== "escalation") fail(404, "\u63D0\u6743\u8BF7\u6C42\u4E0D\u5B58\u5728\u6216\u5DF2\u8FC7\u671F");
     if (esc.resolved_path !== resolved_path) fail(400, "\u6388\u6743\u8DEF\u5F84\u4E0E\u63D0\u6743\u8BF7\u6C42\u4E0D\u4E00\u81F4");
     if (esc.granted !== null && esc.granted !== void 0) fail(400, "\u8BE5\u63D0\u6743\u8BF7\u6C42\u5DF2\u5904\u7406\u8FC7");
+    const lastModelEntry = [...entries].reverse().find(
+      (entry) => isMessageEntry(entry) && Boolean(entry.model?.trim())
+    );
+    const model = lastModelEntry && isMessageEntry(lastModelEntry) ? lastModelEntry.model?.trim() ?? "" : "";
+    if (!model) fail(400, "\u65E0\u6CD5\u786E\u5B9A\u4F1A\u8BDD\u4F7F\u7528\u7684\u6A21\u578B\uFF0C\u8BF7\u91CD\u65B0\u53D1\u9001\u6D88\u606F");
+    ctx.resolver.resolve(model);
     ctx.store.resolveEscalation(sessionId, escalation_id, granted);
     if (!granted) {
       const history2 = ctx.store.buildHistoryBeforeEscalation(sessionId, escalation_id);
@@ -4515,37 +4553,36 @@ function createAgentRoutes(ctx) {
           }
         }
       }
-      const { runId: runId2 } = await launchUserMessage({
+      const { runId: runId2, model: resumedModel2, agentInstanceId: agentInstanceId2 } = await launchUserMessage({
         sessionId,
         content: "",
-        model: "",
+        model,
         history: history2,
         entryCount: entries.length,
         recordUser: false
       });
-      return c.json(ok({ session_id: sessionId, granted: false, run_id: runId2 }, "\u5DF2\u62D2\u7EDD\u6388\u6743\uFF0C\u7531\u6A21\u578B\u7EE7\u7EED\u5E94\u7B54"), 202);
+      return c.json(ok({ session_id: sessionId, granted: false, run_id: runId2, model: resumedModel2, agent_instance_id: agentInstanceId2 }, "\u5DF2\u62D2\u7EDD\u6388\u6743\uFF0C\u7531\u6A21\u578B\u7EE7\u7EED\u5E94\u7B54"), 202);
     }
     if (esc.resource_type === "command") {
-      ctx.grants.grantCapability(sessionId, resolved_path);
+      ctx.grants.grantCapabilityOnce(sessionId, resolved_path);
     } else {
-      ctx.grants.grant(sessionId, resolved_path);
+      ctx.grants.grantOnce(sessionId, resolved_path);
     }
     const lastUser = [...entries].reverse().find(
       (e) => isMessageEntry(e) && e.message.role === "user"
     );
     if (!lastUser || !isMessageEntry(lastUser)) fail(400, "\u4F1A\u8BDD\u4E2D\u6CA1\u6709\u53EF\u7EED\u8DD1\u7684\u7528\u6237\u6D88\u606F");
-    ctx.resolver.resolve("");
     const history = ctx.store.buildHistoryBeforeEscalation(sessionId, escalation_id);
-    const { messageId, runId } = await launchUserMessage({
+    const { messageId, runId, model: resumedModel, agentInstanceId } = await launchUserMessage({
       sessionId,
       content: "",
-      model: "",
+      model,
       history,
       entryCount: entries.length,
       recordUser: false
     });
     return c.json(
-      ok({ session_id: sessionId, message_id: messageId, run_id: runId, granted_path: resolved_path }, "\u5DF2\u6388\u6743\u5E76\u7EE7\u7EED\u6267\u884C"),
+      ok({ session_id: sessionId, message_id: messageId, run_id: runId, model: resumedModel, agent_instance_id: agentInstanceId, granted_path: resolved_path }, "\u5DF2\u6388\u6743\u5E76\u7EE7\u7EED\u6267\u884C"),
       202
     );
   });