@chainingintention/pi-web-cn 1.202608.7 → 1.202608.9

package/dist/server/sessions/piSessionService.js

@@ -1,6 +1,7 @@
-import { realpathSync, statSync } from "node:fs";
-import { readFile, writeFile } from "node:fs/promises";
+import { constants, realpathSync, statSync } from "node:fs";
+import { copyFile, mkdir, readFile, writeFile } from "node:fs/promises";
 import { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
 import { createAgentSessionFromServices, createAgentSessionRuntime, createAgentSessionServices, createEditToolDefinition, createFindToolDefinition, createGrepToolDefinition, getAgentDir, createLsToolDefinition, createReadToolDefinition, createWriteToolDefinition, defineTool, ModelRuntime, readStoredCredential, SessionManager, } from "@earendil-works/pi-coding-agent";
 import { projectBrowserMessage } from "../browserMessageProjection.js";
 import { pageMessagesAtSafeBoundary } from "./messagePaging.js";
@@ -61,6 +62,25 @@ const STARTUP_PHASE_EXTENSIONS = "正在加载会话扩展";
 const STARTUP_CONCURRENT_CATALOG_REFRESH = "服务商模型列表正在刷新";
 const MAX_UNREAD_PUBLICATION_RETRY_MS = 30_000;
 const MAX_PENDING_UNREAD_MUTATIONS = SESSION_UNREAD_LIMIT + 1;
+function auditVisibleAssistantMessage(message) {
+    if (!isAuditRecord(message))
+        return message;
+    const record = message;
+    const content = record["content"];
+    if (!Array.isArray(content))
+        return message;
+    return {
+        ...record,
+        content: content.filter(part => (typeof part !== "object"
+            || part === null
+            || Array.isArray(part)
+            || !isAuditRecord(part)
+            || part["type"] !== "thinking")),
+    };
+}
+function isAuditRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 function noop() {
     // Intentionally empty default unsubscribe callback.
 }
@@ -153,6 +173,8 @@ function parsePromptStreamingBehavior(value) {
     throw new Error('Prompt streamingBehavior must be "steer" or "followUp"');
 }
 const GLOBAL_AGENT_CONTEXT_FILE_NAMES = new Set(["AGENTS.md", "AGENTS.MD", "CLAUDE.md", "CLAUDE.MD"]);
+const MANAGED_RELAY_SKILL_DIRECTORY = join(".pi", "skills", "relay");
+const BUNDLED_RELAY_SKILL_PATH = fileURLToPath(new URL("../../../skills/relay/SKILL.md", import.meta.url));
 export function filterManagedGlobalContextFiles(cwd, agentDir, base) {
     return {
         agentsFiles: base.agentsFiles.filter((file) => {
@@ -168,34 +190,77 @@ export function filterManagedGlobalContextFiles(cwd, agentDir, base) {
 }
 export function filterManagedProjectSkills(cwd, base) {
     const projectRoot = realpathSync(cwd);
+    const pathAllowed = (path) => pathInsideRealDirectory(projectRoot, path);
     return {
         ...base,
-        skills: base.skills.filter((skill) => {
-            try {
-                return pathInsideOrEqual(projectRoot, realpathSync(skill.filePath));
-            }
-            catch {
-                return false;
-            }
-        }),
+        skills: base.skills.filter((skill) => pathAllowed(skill.filePath)),
+        diagnostics: filterManagedSkillDiagnostics(base.diagnostics, pathAllowed),
     };
 }
+export async function ensureManagedRelaySkill(cwd, bundledSkillPath = BUNDLED_RELAY_SKILL_PATH) {
+    const projectRoot = realpathSync(cwd);
+    const piDirectory = resolve(projectRoot, ".pi");
+    const skillsDirectory = join(piDirectory, "skills");
+    const skillDirectory = resolve(projectRoot, MANAGED_RELAY_SKILL_DIRECTORY);
+    const skillPath = join(skillDirectory, "SKILL.md");
+    for (const directory of [piDirectory, skillsDirectory, skillDirectory]) {
+        await ensureManagedSkillDirectory(projectRoot, directory);
+    }
+    try {
+        await copyFile(bundledSkillPath, skillPath, constants.COPYFILE_EXCL);
+    }
+    catch (error) {
+        if (!isNodeError(error, "EEXIST"))
+            throw error;
+    }
+    assertManagedSkillPath(projectRoot, skillPath, "file");
+    return skillPath;
+}
 export function filterManagedWorkbenchSkills(cwd, base, receipt) {
     const projectRoot = realpathSync(cwd);
-    const allowedDirectories = new Set(receipt.skills.map((skill) => resolve(projectRoot, ".pi", "skills", skill.directory)));
+    const allowedDirectories = new Set([
+        resolve(projectRoot, MANAGED_RELAY_SKILL_DIRECTORY),
+        ...receipt.skills.map((skill) => resolve(projectRoot, ".pi", "skills", skill.directory)),
+    ]);
+    const pathAllowed = (path) => [...allowedDirectories].some((directory) => pathInsideRealDirectory(directory, path));
     return {
         ...base,
-        skills: base.skills.filter((skill) => {
-            try {
-                const path = realpathSync(skill.filePath);
-                return [...allowedDirectories].some((directory) => pathInsideOrEqual(directory, path));
-            }
-            catch {
-                return false;
-            }
-        }),
+        skills: base.skills.filter((skill) => pathAllowed(skill.filePath)),
+        diagnostics: filterManagedSkillDiagnostics(base.diagnostics, pathAllowed),
     };
 }
+function filterManagedSkillDiagnostics(diagnostics, pathAllowed) {
+    return diagnostics.filter((diagnostic) => diagnostic.path === undefined || pathAllowed(diagnostic.path));
+}
+function pathInsideRealDirectory(directory, path) {
+    try {
+        return pathInsideOrEqual(directory, realpathSync(path));
+    }
+    catch {
+        return false;
+    }
+}
+async function ensureManagedSkillDirectory(projectRoot, path) {
+    try {
+        await mkdir(path);
+    }
+    catch (error) {
+        if (!isNodeError(error, "EEXIST"))
+            throw error;
+    }
+    assertManagedSkillPath(projectRoot, path, "directory");
+}
+function assertManagedSkillPath(projectRoot, path, expectedType) {
+    const realPath = realpathSync(path);
+    const stats = statSync(realPath);
+    const hasExpectedType = expectedType === "directory" ? stats.isDirectory() : stats.isFile();
+    if (!pathInsideOrEqual(projectRoot, realPath) || !hasExpectedType) {
+        throw new Error(`Managed skill path is invalid: ${path}`);
+    }
+}
+function isNodeError(error, code) {
+    return error instanceof Error && "code" in error && error.code === code;
+}
 function pathInsideOrEqual(parent, child) {
     const normalizedParent = resolve(parent);
     const normalizedChild = resolve(child);
@@ -371,6 +436,7 @@ function createDefaultRuntimeFactory(normalModelRuntimeForCwd, managementModelRu
 }
 function createManagementRuntimeFactory(modelRuntime, resolveSettingsScope, spawn, subsessions, askUser, managementContext, workbench, logger, managementAudit, managementProjectIdForCwd) {
     return async ({ cwd, agentDir, sessionManager, sessionStartEvent, initialModel, initialThinkingLevel, delegationToolsEnabled = true }) => {
+        await ensureManagedRelaySkill(cwd);
         const auditIdentity = await resolveManagementAuditIdentity(cwd, managementContext, managementProjectIdForCwd, logger);
         const accessHandle = workbenchAccessHandle(managementContext);
         const state = workbench === undefined ? undefined : workbench.accessStates.require(accessHandle);
@@ -402,8 +468,23 @@ function createManagementRuntimeFactory(modelRuntime, resolveSettingsScope, spaw
                 cwd,
             },
         });
-        const workbenchToolNames = workbenchTools.map((tool) => tool.name);
-        const policyAgentDir = await writeManagementPermissionSystemPolicy(agentDir, cwd, managementContext, workbenchToolNames);
+        const scopedSpawn = spawn === undefined
+            ? undefined
+            : (input) => spawn({ ...input, managementContext });
+        const scopedSubsessions = subsessions === undefined
+            ? undefined
+            : {
+                ...subsessions,
+                spawn: (input) => subsessions.spawn({ ...input, managementContext }),
+            };
+        const controlledManagementTools = [
+            ...(delegationToolsEnabled && scopedSpawn !== undefined ? [defineTool(createSpawnSessionToolDefinition(cwd, { spawn: scopedSpawn }))] : []),
+            ...(delegationToolsEnabled && scopedSubsessions !== undefined ? createSubsessionToolDefinitions(cwd, scopedSubsessions).map((tool) => defineTool(tool)) : []),
+            ...(askUser === undefined ? [] : [createAskUserToolDefinition(askUser)]),
+            ...workbenchTools,
+        ];
+        const controlledManagementToolNames = controlledManagementTools.map((tool) => tool.name);
+        const policyAgentDir = await writeManagementPermissionSystemPolicy(agentDir, cwd, managementContext, controlledManagementToolNames);
         return withRuntimeCreationEnvironment({ [PI_PERMISSION_SYSTEM_POLICY_AGENT_DIR]: policyAgentDir }, async () => {
             const settingsManager = await createScopedSettingsManager({
                 cwd,
@@ -421,29 +502,17 @@ function createManagementRuntimeFactory(modelRuntime, resolveSettingsScope, spaw
                 },
             });
             const managedToolOptions = createManagedAgentToolOptions(cwd);
-            const scopedSpawn = spawn === undefined
-                ? undefined
-                : (input) => spawn({ ...input, managementContext });
-            const scopedSubsessions = subsessions === undefined
-                ? undefined
-                : {
-                    ...subsessions,
-                    spawn: (input) => subsessions.spawn({ ...input, managementContext }),
-                };
             const customTools = [
                 ...managedAgentToolDefinitions(cwd, managedToolOptions),
                 createManagedPythonToolDefinition(cwd, managementContext),
-                ...(delegationToolsEnabled && scopedSpawn !== undefined ? [defineTool(createSpawnSessionToolDefinition(cwd, { spawn: scopedSpawn }))] : []),
-                ...(delegationToolsEnabled && scopedSubsessions !== undefined ? createSubsessionToolDefinitions(cwd, scopedSubsessions).map((tool) => defineTool(tool)) : []),
-                ...(askUser === undefined ? [] : [createAskUserToolDefinition(askUser)]),
-                ...workbenchTools,
+                ...controlledManagementTools,
             ];
             const options = {
                 services,
                 sessionManager,
                 ...(sessionStartEvent === undefined ? {} : { sessionStartEvent }),
                 customTools,
-                tools: managementAgentToolNames(managementContext, workbenchToolNames),
+                tools: managementAgentToolNames(managementContext, controlledManagementToolNames),
                 ...(initialModel === undefined ? {} : { model: initialModel }),
                 ...(initialThinkingLevel === undefined ? {} : { thinkingLevel: initialThinkingLevel }),
             };
@@ -1654,6 +1723,7 @@ export class PiSessionService {
         void this.submitPrompt(session, promptText, behavior, images, echoUserMessage);
     }
     submitPrompt(session, text, behavior, images = [], echoUserMessage = true) {
+        this.auditUserPrompt(session, text);
         this.publishActivity(session, behavior === "steer" ? "插队消息已排队" : behavior === "followUp" ? "消息已排队" : "消息已接收", "active");
         const eventScope = this.eventScopeForSession(session);
         if (behavior === undefined && echoUserMessage)
@@ -2491,6 +2561,7 @@ export class PiSessionService {
         active.unsubscribe = session.subscribe((event) => {
             this.events.publish(session.sessionId, toClientEvent(event, session.thinkingLevel), active.eventScope);
             this.auditToolExecutionEvent(active, event);
+            this.auditAssistantResponseEvent(active, event);
             this.publishActivityForEvent(session, event);
             const eventType = getString(event, "type");
             if (eventType === "agent_end")
@@ -2839,7 +2910,12 @@ export class PiSessionService {
         }, "Pi tool execution audit");
         if (managementIdentity !== undefined) {
             try {
-                this.managementAudit?.record({ action: "tool_execution", ...managementIdentity, ...auditEvent });
+                this.managementAudit?.record({
+                    action: "tool_execution",
+                    ...managementIdentity,
+                    ...auditEvent,
+                    content: isEnd ? getProperty(event, "result") : getProperty(event, "args"),
+                });
             }
             catch (error) {
                 this.logger.info({ sessionId: auditEvent.sessionId, toolCallId: auditEvent.toolCallId, error: error instanceof Error ? error.message : String(error) }, "failed to enqueue management-mode tool audit");
@@ -2859,6 +2935,43 @@ export class PiSessionService {
             }, "failed to persist ordinary-mode tool audit");
         }
     }
+    auditAssistantResponseEvent(active, event) {
+        if (getString(event, "type") !== "message_end")
+            return;
+        const message = getProperty(event, "message");
+        if (getString(message, "role") !== "assistant")
+            return;
+        this.recordManagementContentAudit(active, "assistant_response", auditVisibleAssistantMessage(message));
+    }
+    auditUserPrompt(session, text) {
+        const active = [...new Set(this.active.values())]
+            .find(candidate => candidate.runtime.session === session);
+        if (active === undefined)
+            return;
+        this.recordManagementContentAudit(active, "user_prompt", text);
+    }
+    recordManagementContentAudit(active, action, content) {
+        const identity = active.managementAuditIdentity;
+        if (identity === undefined || this.managementAudit === undefined)
+            return;
+        try {
+            this.managementAudit.record({
+                action,
+                status: "completed",
+                ...identity,
+                sessionId: active.runtime.session.sessionId,
+                cwd: active.runtime.cwd,
+                content,
+            });
+        }
+        catch (error) {
+            this.logger.info({
+                sessionId: active.runtime.session.sessionId,
+                action,
+                error: error instanceof Error ? error.message : String(error),
+            }, "failed to enqueue management-mode content audit");
+        }
+    }
     /**
      * Build the reporter for one session construction.
      *
@@ -3817,6 +3930,11 @@ async function resolveManagementAuditIdentity(cwd, context, resolveProjectId, lo
             logger.info({ userId: context.user.id, cwd, error: error instanceof Error ? error.message : String(error) }, "failed to resolve management audit project; using the authorized default");
         }
     }
-    return { userId: context.user.id, rootUserId: context.user.rootUserId, projectId };
+    return {
+        userId: context.user.id,
+        rootUserId: context.user.rootUserId,
+        ...(context.user.displayName === undefined ? {} : { userDisplayName: context.user.displayName }),
+        projectId,
+    };
 }
 //# sourceMappingURL=piSessionService.js.map