@chainingintention/pi-web-cn 1.202608.6 → 1.202608.8

package/dist/server/sessions/piSessionService.js

@@ -23,6 +23,7 @@ import { canonicalizeStoredCwd, cwdPathsEqual } from "../workingDirectory.js";
 import { readSessionHeaderSummary } from "./sessionFileHeader.js";
 import { countOutOfListingChildren, locateOutOfListingParents } from "./parentSessionLocator.js";
 import { siblingWorkspaceCwds } from "../workspaces/projectWorkspaceCwds.js";
+import { workbenchAccessHandle } from "../managementEmbed.js";
 import { DEFAULT_EXTENSION_DIALOGS_TIMEOUT_MS, piWebDataDir } from "../../config.js";
 import { createScopedSettingsManager, resolveSettingsScopeDirectory } from "./projectSettingsScope.js";
 import { createAskUserToolDefinition } from "./askUserTool.js";
@@ -40,6 +41,8 @@ import { plainTextTheme } from "./plainTextTheme.js";
 import { SessionUnreadStore } from "./sessionUnreadStore.js";
 import { archiveCandidateFromActiveSession, archiveCandidateFromArchivedRecord, archiveCandidateFromListEntry, archiveInputFromActiveSession, archiveInputFromCandidate, archiveInputFromListEntry, clientSessionFromArchivedRecord, compareArchivedRecords, } from "./sessionArchiveMapping.js";
 import { annotateAssistantThinkingLevel, getBoolean, getProperty, getString, toClientEvent } from "./sessionUiEvents.js";
+import { WorkbenchHttpError } from "../workbench/workbenchClient.js";
+import { createWorkbenchToolDefinitions } from "../workbench/workbenchTools.js";
 const noopLogger = { info() { } };
 const DEFAULT_UNREAD_PUBLICATION_RETRY_MS = 1_000;
 /**
@@ -177,6 +180,22 @@ export function filterManagedProjectSkills(cwd, base) {
         }),
     };
 }
+export function filterManagedWorkbenchSkills(cwd, base, receipt) {
+    const projectRoot = realpathSync(cwd);
+    const allowedDirectories = new Set(receipt.skills.map((skill) => resolve(projectRoot, ".pi", "skills", skill.directory)));
+    return {
+        ...base,
+        skills: base.skills.filter((skill) => {
+            try {
+                const path = realpathSync(skill.filePath);
+                return [...allowedDirectories].some((directory) => pathInsideOrEqual(directory, path));
+            }
+            catch {
+                return false;
+            }
+        }),
+    };
+}
 function pathInsideOrEqual(parent, child) {
     const normalizedParent = resolve(parent);
     const normalizedChild = resolve(child);
@@ -318,11 +337,11 @@ function createRuntimeWithContextAndOneShotSessionOptions(createRuntime, managem
         });
     };
 }
-function createDefaultRuntimeFactory(normalModelRuntimeForCwd, managementModelRuntime, resolveSettingsScope, spawn, subsessions, askUser) {
+function createDefaultRuntimeFactory(normalModelRuntimeForCwd, managementModelRuntime, resolveSettingsScope, spawn, subsessions, askUser, workbench, logger = noopLogger, managementAudit, managementProjectIdForCwd) {
     return async ({ cwd, agentDir, sessionManager, sessionStartEvent, managementContext, initialModel, initialThinkingLevel, delegationToolsEnabled = true }) => {
         const scopedModelRuntime = managementContext === undefined ? await normalModelRuntimeForCwd(cwd) : await managementModelRuntime();
         if (managementContext !== undefined) {
-            return createManagementRuntimeFactory(scopedModelRuntime, resolveSettingsScope, spawn, subsessions, askUser, managementContext)({
+            return createManagementRuntimeFactory(scopedModelRuntime, resolveSettingsScope, spawn, subsessions, askUser, managementContext, workbench, logger, managementAudit, managementProjectIdForCwd)({
                 cwd,
                 agentDir,
                 sessionManager,
@@ -350,9 +369,56 @@ function createDefaultRuntimeFactory(normalModelRuntimeForCwd, managementModelRu
         return { ...result, services, diagnostics: services.diagnostics };
     };
 }
-function createManagementRuntimeFactory(modelRuntime, resolveSettingsScope, spawn, subsessions, askUser, managementContext) {
+function createManagementRuntimeFactory(modelRuntime, resolveSettingsScope, spawn, subsessions, askUser, managementContext, workbench, logger, managementAudit, managementProjectIdForCwd) {
     return async ({ cwd, agentDir, sessionManager, sessionStartEvent, initialModel, initialThinkingLevel, delegationToolsEnabled = true }) => {
-        const policyAgentDir = await writeManagementPermissionSystemPolicy(agentDir, cwd, managementContext);
+        const auditIdentity = await resolveManagementAuditIdentity(cwd, managementContext, managementProjectIdForCwd, logger);
+        const accessHandle = workbenchAccessHandle(managementContext);
+        const state = workbench === undefined ? undefined : workbench.accessStates.require(accessHandle);
+        let receipt;
+        try {
+            receipt = state === undefined ? undefined : await workbench?.skills.synchronize(cwd, state, {
+                ...(managementAudit === undefined ? {} : { recorder: managementAudit }),
+                ...auditIdentity,
+                sessionId: sessionManager.getSessionId(),
+                cwd,
+            });
+        }
+        catch (error) {
+            if (error instanceof WorkbenchHttpError && error.status === 401 && accessHandle !== undefined)
+                workbench?.accessStates.delete(accessHandle);
+            throw error;
+        }
+        const workbenchTools = state === undefined || workbench === undefined ? [] : createWorkbenchToolDefinitions({
+            getState: () => workbench.accessStates.require(accessHandle),
+            workbench: workbench.client,
+            mcp: workbench.mcp,
+            invalidate: () => { if (accessHandle !== undefined)
+                workbench.accessStates.delete(accessHandle); },
+            logger,
+            ...(managementAudit === undefined ? {} : { audit: managementAudit }),
+            auditContext: {
+                ...auditIdentity,
+                sessionId: sessionManager.getSessionId(),
+                cwd,
+            },
+        });
+        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,
@@ -366,32 +432,21 @@ function createManagementRuntimeFactory(modelRuntime, resolveSettingsScope, spaw
                 settingsManager,
                 resourceLoaderOptions: {
                     agentsFilesOverride: (base) => filterManagedGlobalContextFiles(cwd, agentDir, base),
-                    skillsOverride: (base) => filterManagedProjectSkills(cwd, base),
+                    skillsOverride: (base) => receipt === undefined ? filterManagedProjectSkills(cwd, base) : filterManagedWorkbenchSkills(cwd, base, receipt),
                 },
             });
             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)]),
+                ...controlledManagementTools,
             ];
             const options = {
                 services,
                 sessionManager,
                 ...(sessionStartEvent === undefined ? {} : { sessionStartEvent }),
                 customTools,
-                tools: managementAgentToolNames(managementContext),
+                tools: managementAgentToolNames(managementContext, controlledManagementToolNames),
                 ...(initialModel === undefined ? {} : { model: initialModel }),
                 ...(initialThinkingLevel === undefined ? {} : { thinkingLevel: initialThinkingLevel }),
             };
@@ -521,6 +576,9 @@ export class PiSessionService {
         this.spawnTargets = deps.spawnTargets;
         this.projectWorkspaces = deps.projectWorkspaces;
         this.logger = deps.logger ?? noopLogger;
+        this.normalToolAudit = deps.normalToolAudit;
+        this.managementAudit = deps.managementAudit;
+        this.managementProjectIdForCwd = deps.managementProjectIdForCwd;
         this.now = deps.now ?? (() => new Date());
         this.notificationStore = deps.notificationStore ?? new SessionNotificationStore();
         this.unreadStore = deps.unreadStore ?? new SessionUnreadStore();
@@ -538,7 +596,7 @@ export class PiSessionService {
             list: (parentSessionId, parentSessionFile) => this.listSubsessions(parentSessionId, parentSessionFile),
             check: (parentSessionId, sessionId, parentSessionFile) => this.checkSubsession(parentSessionId, sessionId, parentSessionFile),
             read: (parentSessionId, sessionId, query, parentSessionFile) => this.readSubsession(parentSessionId, sessionId, query, parentSessionFile),
-        }, deps.askUserEnabled === true ? { open: (input) => this.openAsk(input) } : undefined);
+        }, deps.askUserEnabled === true ? { open: (input) => this.openAsk(input) } : undefined, deps.workbench, this.logger, this.managementAudit, this.managementProjectIdForCwd);
         this.createAgentRuntime = deps.createAgentRuntime ?? defaultCreateAgentRuntime;
         this.workspaceActivity = deps.workspaceActivity;
         this.heartbeat = setInterval(() => { this.publishHeartbeats(); }, deps.heartbeatIntervalMs ?? 2000);
@@ -2435,6 +2493,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.publishActivityForEvent(session, event);
             const eventType = getString(event, "type");
             if (eventType === "agent_end")
@@ -2763,6 +2822,46 @@ export class PiSessionService {
         if (this.hasActiveWork(session))
             this.publishActivity(session, "正在处理", "active");
     }
+    auditToolExecutionEvent(active, event) {
+        const eventType = getString(event, "type");
+        if (eventType !== "tool_execution_start" && eventType !== "tool_execution_end")
+            return;
+        const isEnd = eventType === "tool_execution_end";
+        const auditEvent = {
+            sessionId: active.runtime.session.sessionId,
+            cwd: active.runtime.cwd,
+            toolName: getString(event, "toolName") ?? "unknown",
+            toolCallId: getString(event, "toolCallId") ?? "unknown",
+            status: isEnd ? (getBoolean(event, "isError") === true ? "failed" : "completed") : "started",
+        };
+        const managementIdentity = active.managementAuditIdentity;
+        this.logger.info({
+            mode: active.managementContextKey === undefined ? "normal" : "management",
+            ...(managementIdentity ?? {}),
+            ...auditEvent,
+        }, "Pi tool execution audit");
+        if (managementIdentity !== undefined) {
+            try {
+                this.managementAudit?.record({ action: "tool_execution", ...managementIdentity, ...auditEvent });
+            }
+            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");
+            }
+            return;
+        }
+        if (this.normalToolAudit === undefined)
+            return;
+        try {
+            this.normalToolAudit.record(auditEvent);
+        }
+        catch (error) {
+            this.logger.info({
+                sessionId: auditEvent.sessionId,
+                toolCallId: auditEvent.toolCallId,
+                error: error instanceof Error ? error.message : String(error),
+            }, "failed to persist ordinary-mode tool audit");
+        }
+    }
     /**
      * Build the reporter for one session construction.
      *
@@ -3036,6 +3135,9 @@ export class PiSessionService {
             unsubscribe: noop,
             managementContextKey: managementContextKey(options.managementContext),
             eventScope: eventScopeFromManagementContext(options.managementContext),
+            ...(options.managementContext === undefined ? {} : {
+                managementAuditIdentity: await resolveManagementAuditIdentity(cwd, options.managementContext, this.managementProjectIdForCwd, this.logger),
+            }),
         };
         let boundSession = runtime.session;
         let notificationGeneration = options.notificationGeneration;
@@ -3708,4 +3810,16 @@ function finalAssistantText(messages) {
 function isRecord(value) {
     return typeof value === "object" && value !== null;
 }
+async function resolveManagementAuditIdentity(cwd, context, resolveProjectId, logger) {
+    let projectId = context.projects[0]?.id ?? "default-project";
+    if (resolveProjectId !== undefined) {
+        try {
+            projectId = await resolveProjectId(cwd, context);
+        }
+        catch (error) {
+            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 };
+}
 //# sourceMappingURL=piSessionService.js.map