@rzx/ohs 1.1.23 → 1.1.24

package/dist/index.js

@@ -13786,6 +13786,7 @@ var init_auto_review = __esm(() => {
     "large_change",
     "many_files",
     "sensitive_path",
+    "sensitive_content_path",
     "production_delete_or_rename",
     "patch_truncated",
     "not_git_repository",
@@ -13796,6 +13797,7 @@ var init_auto_review = __esm(() => {
     "review_output_invalid",
     "review_child_failed",
     "review_child_timed_out",
+    "review_preempted_by_user",
     "parent_run_not_completed",
     "daemon_restarted"
   ];
@@ -359267,6 +359269,9 @@ function normalizeToolInput2(schema, input) {
   const propertyNames = Object.keys(properties);
   if (propertyNames.length === 0)
     return input;
+  if (!Object.prototype.hasOwnProperty.call(properties, "arguments") && Object.keys(input).length === 1 && isRecord11(input.arguments) && validateToolInput2(schema, input.arguments) === null) {
+    return input.arguments;
+  }
   const normalized = { ...input };
   const copiedFrom = /* @__PURE__ */ new Set;
   for (const key of propertyNames) {
@@ -375986,7 +375991,7 @@ function deriveChildAgentOptions(input) {
     permissionMode: child.permissionMode ?? configuration.permissionMode,
     hostToolCeiling: configuration.hostToolCeiling,
     roleAllowedTools: child.allowedTools,
-    ...input.internalToolLimitNone ? { internalToolLimitNone: true } : {},
+    ...input.internalTextOnly ? { internalTextOnly: true } : {},
     disallowedTools: mergeToolLists(configuration.disallowedTools, child.disallowedTools),
     maxTurns: resolveChildMaxTurns({
       roleMaxTurns: child.maxTurns,
@@ -376596,7 +376601,7 @@ function resolveAutoApproveTools(settings, overrides, trustedBuiltinToolNames) {
   return merged.size > 0 ? [...merged] : undefined;
 }
 function resolveEffectiveAllowedTools(options) {
-  if (options.internalToolLimitNone)
+  if (options.internalTextOnly)
     return { kind: "none" };
   const knownToolNames = options.knownToolNames ?? [];
   const hostCeiling = resolveToolLimit(options.hostToolCeiling ?? options.settingsAllowedTools ?? [], knownToolNames);
@@ -376637,7 +376642,7 @@ async function createVykorRuntime(options) {
     roleAllowedTools: configuration.roleAllowedTools,
     settingsAllowedTools: settings.permission.allowedTools,
     knownToolNames,
-    internalToolLimitNone: configuration.internalToolLimitNone
+    internalTextOnly: configuration.internalTextOnly
   });
   const effectiveDenied = new Set(normalizeToolNames2([
     ...settings.permission.deniedTools ?? [],
@@ -376658,6 +376663,7 @@ async function createVykorRuntime(options) {
     trustedLocalReadOnlyToolNames: [...trustedBuiltinToolNames]
   });
   const hookExecutor = new HookExecutor({
+    disabled: configuration.internalTextOnly === true,
     cwd: options.executionEnvironment?.workspace.executionRoot ?? hostCwd,
     sessionId: options.sessionId,
     settings,
@@ -381935,7 +381941,7 @@ async function composeVykorAgentInternal(options, internal, cleanup, rollback) {
   const cwd = options.cwd ?? process.cwd();
   const settings = options.settings ?? await loadSettings2({});
   const discovery = await discoverVykorExtensions(cwd, settings, {
-    pluginsEnabled: options.pluginsEnabled
+    pluginsEnabled: options.internalTextOnly ? false : options.pluginsEnabled
   });
   for (const warning of discovery.warnings) {
     process.stderr.write(`[plugins] ${warning}
@@ -382017,11 +382023,11 @@ async function composeVykorAgentInternal(options, internal, cleanup, rollback) {
     settings,
     runtime,
     discovery,
-    extensions: options.extensions,
-    mcpServers: options.mcpServers,
+    extensions: options.internalTextOnly ? [] : options.extensions,
+    mcpServers: options.internalTextOnly ? {} : options.mcpServers,
     memory: environment.memory,
     executionEnvironment,
-    mcpRuntimeRegistry: options.mcpRuntimeRegistry
+    mcpRuntimeRegistry: options.internalTextOnly ? undefined : options.mcpRuntimeRegistry
   });
   const session = createAgentSession2({
     queryEngine: runtime.queryEngine,
@@ -382827,7 +382833,7 @@ var require2, __create2, __defProp2, __getOwnPropDesc, __getOwnPropNames2, __get
     });
   }
   runChildForCompletedRun(input, parent, sensitiveInitialContent, capabilityView) {
-    return this.runMaintenance("review", async () => {
+    return this.runMaintenance("post_run_child", async () => {
       const scope = {
         agentId: this.id,
         sessionId: this.id,
@@ -382838,10 +382844,12 @@ var require2, __create2, __defProp2, __getOwnPropDesc, __getOwnPropNames2, __get
         signal: parent.signal ?? new AbortController().signal
       };
       const invocation = await this.childManager.spawnSystemChild(scope, input, sensitiveInitialContent, capabilityView);
-      const result2 = await invocation.result;
-      await this.childManager.close(invocation.id, "System review finished").catch(() => {
-        return;
-      });
+      let result2;
+      try {
+        result2 = await invocation.result;
+      } finally {
+        await this.childManager.close(invocation.id, "Post-run child finished");
+      }
       return { invocation, result: result2 };
     });
   }
@@ -387555,7 +387563,7 @@ rm -- "$1"`, WslFileOperations2 = class {
         child: input,
         cwd: lease.cwd,
         sessionId,
-        ...system ? { internalToolLimitNone: true } : {}
+        ...system ? { internalTextOnly: true } : {}
       }), {
         childId,
         parentSessionId: parentScope.sessionId,
@@ -387613,16 +387621,10 @@ rm -- "$1"`, WslFileOperations2 = class {
         throw new Error("Parent run interrupted");
       }
       const receipt = await this.beginRun(record2, {
-        content: options.initialContent ?? childInitialTask(input)
+        content: options.initialContent ?? childInitialTask(input),
+        ...system ? { metadata: { sensitiveInput: true } } : {}
       });
       budgetReservation.commit();
-      if (system) {
-        record2.result.catch(() => {}).finally(() => {
-          if (this.records.has(childId)) {
-            this.close(childId, "System review finished").catch(() => {});
-          }
-        });
-      }
       return {
         id: childId,
         sessionId,
@@ -388275,6 +388277,7 @@ rm -- "$1"`, WslFileOperations2 = class {
     return this.mode;
   }
 }, HookExecutor = class {
+  disabled;
   hooks = /* @__PURE__ */ new Map;
   client;
   defaultModel;
@@ -388283,6 +388286,7 @@ rm -- "$1"`, WslFileOperations2 = class {
   settings;
   processExecutor;
   constructor(options) {
+    this.disabled = options?.disabled ?? false;
     this.client = options?.client;
     this.defaultModel = options?.defaultModel;
     this.cwd = options?.cwd ?? process.cwd();
@@ -388329,6 +388333,8 @@ rm -- "$1"`, WslFileOperations2 = class {
     return results;
   }
   getHooksForEvent(event, context) {
+    if (this.disabled)
+      return [];
     const subject = context ? matchSubject(context) : "";
     const filtered = [...this.hooks.values()].filter((h2) => {
       if (h2.event !== event || !h2.enabled)
@@ -403568,6 +403574,7 @@ Complete the user's request by providing accurate, documentation-based guidance.
         "large_change",
         "many_files",
         "sensitive_path",
+        "sensitive_content_path",
         "production_delete_or_rename",
         "patch_truncated",
         "not_git_repository",
@@ -403578,6 +403585,7 @@ Complete the user's request by providing accurate, documentation-based guidance.
         "review_output_invalid",
         "review_child_failed",
         "review_child_timed_out",
+        "review_preempted_by_user",
         "parent_run_not_completed",
         "daemon_restarted"
       ];
@@ -475155,6 +475163,9 @@ class SessionEventPublisher {
 // ../../packages/server/src/session/export-session.ts
 import { mkdir as mkdir16, writeFile as writeFile10 } from "node:fs/promises";
 import { isAbsolute as isAbsolute11, join as join40 } from "node:path";
+function hasSensitiveInput(inputs) {
+  return inputs.some((item) => item.metadata.sensitiveInput === true || item.metadata.autoReviewSensitive === true);
+}
 function partsForMessage(messageId, parts) {
   return parts.filter((part) => part.messageId === messageId).filter(isCommittedModelPart).sort((a, b) => a.seq - b.seq);
 }
@@ -475176,6 +475187,7 @@ function markdownFromParts(parts) {
 `);
 }
 function buildMarkdown(input) {
+  const sensitiveSession = hasSensitiveInput(input.inputs);
   const lines = [
     "# Vykor Conversation Export",
     "",
@@ -475188,6 +475200,10 @@ function buildMarkdown(input) {
     ""
   ];
   for (const message of [...input.messages].sort((a, b) => a.seq - b.seq)) {
+    if (sensitiveSession) {
+      lines.push(`## ${message.role}`, "", REDACTED_CONTENT, "", "---", "");
+      continue;
+    }
     const messageParts = partsForMessage(message.id, input.parts);
     if (message.role === "user") {
       lines.push("## User", "", markdownFromParts(messageParts), "", "---", "");
@@ -475212,7 +475228,11 @@ function buildMarkdown(input) {
 `);
 }
 function buildJson(input) {
+  const sensitiveSession = hasSensitiveInput(input.inputs);
   const messages = [...input.messages].sort((a, b) => a.seq - b.seq).map((message) => {
+    if (sensitiveSession) {
+      return { role: message.role, content: REDACTED_CONTENT, parts: [] };
+    }
     const messageParts = partsForMessage(message.id, input.parts);
     if (message.role === "user" || message.role === "system") {
       return { role: message.role, content: textFromParts2(messageParts), parts: messageParts };
@@ -475235,7 +475255,7 @@ function buildJson(input) {
     model: input.session.model,
     exported_at: new Date().toISOString(),
     message_count: input.messages.length,
-    inputs: [...input.inputs].sort((a, b) => a.seq - b.seq),
+    inputs: [...input.inputs].sort((a, b) => a.seq - b.seq).map((item) => sensitiveSession ? { ...item, content: REDACTED_CONTENT, items: [], attachments: [] } : item),
     messages
   }, null, 2);
 }
@@ -475256,6 +475276,7 @@ async function writeSessionExport(input) {
     messageCount: input.messages.length
   };
 }
+var REDACTED_CONTENT = "[redacted: sensitive content]";
 var init_export_session = __esm(() => {
   init_src();
   init_src4();
@@ -476794,7 +476815,12 @@ function assembleSessionRunServices(options) {
     },
     runtimeQueue: {
       hasRuntime: options.agentPool.configured,
-      enqueueRun: (run, inputId) => engine.runtimeBridge.enqueueRun(run, inputId),
+      enqueueRun: (run, inputId) => {
+        if (!run.metadata?.goalRunKind || run.metadata.goalRunKind === "user") {
+          options.preemptAutoReview?.(run.sessionId);
+        }
+        return engine.runtimeBridge.enqueueRun(run, inputId);
+      },
       runState: (sessionId, runId) => engine.runtimeBridge.runState(sessionId, runId),
       steer: (sessionId, input) => engine.runtimeBridge.steer(sessionId, input)
     },
@@ -477873,6 +477899,7 @@ var init_auto_review_result = __esm(() => {
 class SessionAutoReviewService {
   options;
   baselines = new Map;
+  activeReviews = new Map;
   now;
   log;
   constructor(options) {
@@ -477882,6 +477909,9 @@ class SessionAutoReviewService {
       return;
     });
   }
+  preemptForUserInput(sessionId) {
+    this.activeReviews.get(sessionId)?.abort("user_input");
+  }
   async captureBaseline(input) {
     if (input.mode === "off") {
       this.transition(input.sessionId, input.runId, {
@@ -477934,8 +477964,37 @@ class SessionAutoReviewService {
         finishedAt: this.now()
       });
     }
+    const controller = new AbortController;
+    this.activeReviews.set(input.sessionId, controller);
+    const signal = AbortSignal.any([input.signal, controller.signal]);
+    let onAbort;
     try {
-      const compared = await this.options.inspector.compare(input.cwd, entry.baseline);
+      if (this.options.hasUserWork?.(input.sessionId))
+        controller.abort("user_input");
+      const interrupted = new Promise((resolve) => {
+        onAbort = () => resolve("interrupted");
+        if (signal.aborted)
+          onAbort();
+        else
+          signal.addEventListener("abort", onAbort, { once: true });
+      });
+      const compared = signal.aborted ? "interrupted" : await Promise.race([
+        this.options.inspector.compare(input.cwd, entry.baseline),
+        interrupted
+      ]);
+      if (onAbort)
+        signal.removeEventListener("abort", onAbort);
+      if (compared === "interrupted" || signal.aborted) {
+        const userPreempted = signal.reason === "user_input";
+        return this.settle(input.sessionId, input.runId, {
+          mode: entry.mode,
+          riskLevel: "unknown",
+          status: userPreempted ? "skipped" : "failed",
+          reasons: [userPreempted ? "review_preempted_by_user" : "review_child_failed"],
+          startedAt,
+          finishedAt: this.now()
+        });
+      }
       if (isUnavailable(compared)) {
         return this.settle(input.sessionId, input.runId, {
           mode: entry.mode,
@@ -477946,7 +478005,7 @@ class SessionAutoReviewService {
           finishedAt: this.now()
         });
       }
-      return await this.runReview(input, entry.mode, compared, startedAt);
+      return await this.runReview({ ...input, signal }, entry.mode, compared, startedAt);
     } catch (error) {
       this.log({ event: "auto_review.error", runId: input.runId, error: errorText(error) });
       return this.settle(input.sessionId, input.runId, {
@@ -477957,6 +478016,11 @@ class SessionAutoReviewService {
         startedAt,
         finishedAt: this.now()
       });
+    } finally {
+      if (onAbort)
+        signal.removeEventListener("abort", onAbort);
+      if (this.activeReviews.get(input.sessionId) === controller)
+        this.activeReviews.delete(input.sessionId);
     }
   }
   async runReview(input, mode, changeSet, startedAt) {
@@ -478030,8 +478094,8 @@ class SessionAutoReviewService {
       return this.settle(input.sessionId, input.runId, {
         mode,
         riskLevel: decision.level,
-        status: "failed",
-        reasons: ["review_child_failed"],
+        status: input.signal.reason === "user_input" ? "skipped" : "failed",
+        reasons: [input.signal.reason === "user_input" ? "review_preempted_by_user" : "review_child_failed"],
         patchTruncated: changeSet.patchTruncated,
         ...invocationId ? { reviewTaskId: invocationId } : {},
         startedAt,
@@ -478039,6 +478103,19 @@ class SessionAutoReviewService {
       });
     }
     const finishedAt = this.now();
+    if (input.signal.aborted) {
+      const userPreempted = input.signal.reason === "user_input";
+      return this.settle(input.sessionId, input.runId, {
+        mode,
+        riskLevel: decision.level,
+        status: userPreempted ? "skipped" : "failed",
+        reasons: [userPreempted ? "review_preempted_by_user" : "review_child_failed"],
+        patchTruncated: changeSet.patchTruncated,
+        ...invocationId !== undefined ? { reviewTaskId: invocationId } : {},
+        startedAt,
+        finishedAt
+      });
+    }
     if (childResult.status !== "completed") {
       const timedOut = childResult.failureKind === "timeout";
       return this.settle(input.sessionId, input.runId, {
@@ -478290,14 +478367,14 @@ class DefaultGitRunChangeInspector {
           return unavailable4("preexisting_dirty_overlap");
         }
       }
-      const newPaths = currentPaths.filter((path) => !(path in baseline.dirty));
-      const contextPaths = first.entries.map((entry) => entry.oldPath).filter((path) => path !== undefined && !(path in baseline.dirty));
+      const newPaths = currentPaths.filter((path) => !Object.hasOwn(baseline.dirty, path));
+      const contextPaths = first.entries.map((entry) => entry.oldPath).filter((path) => path !== undefined && !Object.hasOwn(baseline.dirty, path));
       result = await this.buildWorktreeChangeSet(cwd, first, newPaths, contextPaths);
     } else {
       const ancestor = await this.isAncestor(cwd, baseline.head, first.head);
       if (!ancestor)
         return unavailable4("non_linear_head_change");
-      const currentDirty = {};
+      const currentDirty = Object.create(null);
       for (const path of currentPaths)
         currentDirty[path] = collected.entries[path];
       if (!sameDirtyMap(currentDirty, baseline.dirty)) {
@@ -478305,6 +478382,8 @@ class DefaultGitRunChangeInspector {
       }
       result = await this.buildCommitChangeSet(cwd, baseline.head, first.head);
     }
+    if (result && isUnavailable2(result))
+      return result;
     if (!result)
       return unavailable4("git_inspection_failed");
     const second = await readRepoState(this.executor, cwd);
@@ -478323,6 +478402,8 @@ class DefaultGitRunChangeInspector {
     const nameStatus = await this.readNameStatus(cwd, ["HEAD", "--", ...pathspec]);
     if (!nameStatus)
       return;
+    if (hasSensitiveContentPath(newPaths, nameStatus))
+      return unavailable4("sensitive_content_path");
     const numstat = await this.readNumstat(cwd, ["HEAD", "--", ...pathspec]);
     if (!numstat)
       return;
@@ -478374,6 +478455,9 @@ class DefaultGitRunChangeInspector {
     const nameStatus = await this.readNameStatus(cwd, [baseHead, head]);
     if (!nameStatus)
       return;
+    if (hasSensitiveContentPath([...nameStatus.keys()], nameStatus)) {
+      return unavailable4("sensitive_content_path");
+    }
     const numstat = await this.readNumstat(cwd, [baseHead, head]);
     if (!numstat)
       return;
@@ -478400,8 +478484,8 @@ class DefaultGitRunChangeInspector {
     };
   }
   async collect(state, cwd, paths) {
-    const entries = {};
-    const hashes = {};
+    const entries = Object.create(null);
+    const hashes = Object.create(null);
     for (const path of paths) {
       const status = state.statusByPath.get(path) ?? "";
       if (isUnmergedStatus(status))
@@ -478449,6 +478533,19 @@ class DefaultGitRunChangeInspector {
     return parsed?.get(path) ?? 0;
   }
 }
+function isUnavailable2(value) {
+  return value.attribution === "unavailable";
+}
+function hasSensitiveContentPath(paths, nameStatus) {
+  return paths.some((path) => {
+    const oldPath = nameStatus.get(path)?.oldPath;
+    return isSensitiveContentPath(path) || oldPath !== undefined && isSensitiveContentPath(oldPath);
+  });
+}
+function isSensitiveContentPath(path) {
+  const name = path.replace(/\\/g, "/").split("/").at(-1)?.toLowerCase() ?? "";
+  return /^\.env(?:\.|$)/.test(name) || name === ".npmrc" || name === ".pypirc" || name === "credentials.json" || /\.(?:pem|key|p12|pfx|jks|keystore)$/.test(name);
+}
 function unavailable4(reason) {
   return { attribution: "unavailable", reason };
 }
@@ -576576,6 +576673,7 @@ class DaemonApplication {
         session: store,
         events: this.eventPublisher,
         inspector: createGitRunChangeInspector(),
+        hasUserWork: (sessionId) => this.runControl.hasUserWork(sessionId),
         log: (entry) => {
           options.log({
             level: "warn",
@@ -576611,6 +576709,7 @@ class DaemonApplication {
         agentPool: this.agentPool,
         runExecutor,
         events: this.eventPublisher,
+        preemptAutoReview: (sessionId) => autoReview.preemptForUserInput(sessionId),
         attachmentLimits: this.attachments.limits,
         materializeSteerInput,
         assertReady: () => this.assertReady(),
@@ -584611,4 +584710,4 @@ program.command("doctor").description("Check environment and dependencies").acti
 });
 program.parse();
 
-//# debugId=38334AAE109FB55C64756E2164756E21
+//# debugId=BB50289069DAC80B64756E2164756E21