@optimuslabs/harness-map-staging 1.5.44 → 1.5.46

package/dist/agent_block_window/agent_block_window.jxa

@@ -31,27 +31,51 @@ function esc(value) {
     .replace(/'/g, ''');
 }
 
+/** Manrope, the website's typeface, shipped beside this script (SIL Open Font License, Manrope-OFL.txt). */
+const FONT_FILE = 'manrope-latin-wght-normal.woff2';
+
+/**
+ * The website's typeface as an embedded @font-face, read from the font file beside this script
+ * (osascript's own arguments name the script's path), so the window needs no network. '' when it
+ * cannot be read: the window then falls back to the system font.
+ */
+function fontFace() {
+  try {
+    const args = ObjC.deepUnwrap($.NSProcessInfo.processInfo.arguments) || [];
+    const script = args.find((a) => String(a).endsWith('agent_block_window.jxa'));
+    if (!script) return '';
+    const data = $.NSData.dataWithContentsOfFile(String(script).replace(/agent_block_window\.jxa$/, FONT_FILE));
+    if (!data || data.isNil()) return '';
+    const b64 = data.base64EncodedStringWithOptions(0).js;
+    return `@font-face { font-family: "Manrope"; src: url(data:font/woff2;base64,${b64}) format("woff2"); font-weight: 200 800; }`;
+  } catch (e) {
+    return '';
+  }
+}
+
+/**
+ * The website's Manrope and logo, its brand green for the primary action and its 8px radius, on the
+ * window's own high-contrast colours: solid red and green boxes, near-white text. The website's
+ * zinc theme was tried and was harder to read in a small window.
+ */
 const STYLE = `
   :root { color-scheme: dark; }
   * { box-sizing: border-box; }
   html, body { margin: 0; background: transparent; }
-  body { font: 14px/1.45 -apple-system, BlinkMacSystemFont, "SF Pro Text", sans-serif; color: #e8e8ea;
+  body { font: 14px/1.45 Manrope, -apple-system, BlinkMacSystemFont, sans-serif; color: #e8e8ea;
          -webkit-user-select: none; cursor: default; }
   .card { background: #2b2d31; }
-  header { display: flex; align-items: center; justify-content: space-between; padding: 16px 20px;
+  header { display: flex; align-items: center; justify-content: space-between; padding: 14px 20px;
            border-bottom: 1px solid #3a3c41; }
-  .brand { display: flex; align-items: center; gap: 10px; font-weight: 600; font-size: 15px; color: #cfd0d3; }
-  .logo { flex: none; width: 24px; height: 24px; border-radius: 50%; background: #c9f2cf; color: #15361c;
-          display: grid; place-items: center; font: 700 12px/1 ui-rounded, -apple-system, sans-serif; }
-  .logo.big { width: 44px; height: 44px; font-size: 18px; }
+  .logo { display: block; height: 40px; width: auto; margin: -4px 0 -4px -6px; }
   .scope { font-size: 13px; color: #b7b8bc; }
   main { padding: 22px 20px 18px; }
   h1 { font-size: 22px; line-height: 1.25; font-weight: 700; margin: 0 0 16px; color: #fff; }
-  .box { border-radius: 10px; padding: 14px 16px; margin-bottom: 14px; }
+  .box { border-radius: 8px; padding: 14px 16px; margin-bottom: 14px; }
   .reason { background: #3a2224; border: 1px solid #7a3d3d; display: flex; gap: 12px; }
   .reason .icon { flex: none; width: 18px; height: 18px; margin-top: 2px; border: 1.6px solid #f0a8a8;
-                  border-radius: 50%; color: #f0a8a8; display: grid; place-items: center; font: 700 11px/1 sans-serif; }
-  .reason strong { display: block; color: #fff; font-size: 15px; margin-bottom: 4px; }
+                  border-radius: 50%; color: #f0a8a8; display: grid; place-items: center; font: 700 11px/1 Manrope, sans-serif; }
+  .reason strong { display: block; color: #fff; font-size: 15px; font-weight: 700; margin-bottom: 4px; }
   .reason p { margin: 0; color: #dedee0; }
   .reason hr { border: 0; border-top: 1px solid #7a3d3d; margin: 12px 0 10px; }
   .findings { display: grid; grid-template-columns: max-content 1fr; gap: 6px 16px; margin: 0; }
@@ -63,24 +87,25 @@ const STYLE = `
   .row { display: flex; align-items: center; gap: 16px; }
   .grow { flex: 1; }
   .label { font-size: 11.5px; font-weight: 700; letter-spacing: .08em; text-transform: uppercase; color: #8fd39a; }
-  .path h2 { margin: 4px 0 2px; font-size: 16px; color: #fff; }
+  .path h2 { margin: 4px 0 2px; font-size: 16px; font-weight: 700; color: #fff; }
   .path p { margin: 0; color: #b9bdb9; font-size: 13px; }
   .path p.sub { color: #d4e7d7; font-size: 13.5px; margin-bottom: 4px; }
   .path hr { border: 0; border-top: 1px solid #44574a; margin: 14px 0 12px; }
   .also { display: flex; align-items: center; gap: 10px; flex-wrap: wrap; color: #b9bdb9; font-size: 13px; }
   .chip { background: #2f3134; border: 1px solid #4b4d52; border-radius: 7px; padding: 5px 12px; color: #e8e8ea; font-size: 13px; }
   button { font: inherit; cursor: pointer; border-radius: 8px; }
-  .primary { background: #2f6fdb; color: #fff; border: 0; padding: 10px 22px; font-weight: 600; font-size: 14px; white-space: nowrap; }
-  .primary:hover { background: #3a7bea; }
+  .primary { background: #22c55e; color: #052e16; border: 0; padding: 10px 22px; font-weight: 700; font-size: 14px; white-space: nowrap; }
+  .primary:hover { background: #16a34a; }
   .secondary { background: #3a3c41; color: #e8e8ea; border: 1px solid #4b4d52; padding: 8px 20px; font-size: 14px; }
   .secondary:hover { background: #44464b; }
-  .link { background: none; border: 0; padding: 0; color: #7fb0ff; text-decoration: underline; font-size: 14px; }
+  .link { background: none; border: 0; padding: 0; color: #4ade80; text-decoration: underline; font-size: 14px; }
   footer { display: flex; align-items: center; justify-content: space-between; padding: 14px 20px;
            border-top: 1px solid #3a3c41; gap: 12px; }
 `;
 
+/** The website's wordmark for dark backgrounds (frontend_v2/src/assets/optimus_logo_darkbg.svg). */
 function header(w, withScope) {
-  return `<header><div class="brand"><span class="logo">o/</span>${esc(w.brand)}</div>${
+  return `<header><svg class="logo" role="img" aria-label="${esc(w.brand)}" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 600 214.5"> <ellipse fill="#7cea9c" cx="122.2" cy="107.3" rx="72.1" ry="72.2"/> <g> <path fill="#ffffff" d="M86.3,107.4c0-9.7,3.5-18,10.4-24.8,7-6.8,15.5-10.2,25.5-10.2s18.6,3.4,25.6,10.3c6.9,6.9,10.4,15.3,10.4,25.3s-3.5,18.6-10.4,25.4c-7,6.8-15.6,10.2-25.8,10.2s-18.6-3.5-25.4-10.4c-6.8-6.8-10.2-15.4-10.2-25.7ZM102.2,107.6c0,6.7,1.8,12.1,5.4,16,3.7,4,8.6,5.9,14.6,5.9s11-2,14.6-5.9c3.6-3.9,5.5-9.2,5.5-15.7s-1.8-11.8-5.5-15.7c-3.7-4-8.6-6-14.6-6s-10.8,2-14.5,6c-3.7,4-5.5,9.1-5.5,15.4Z"/> <path fill="#ffffff" d="M187.2,178.2h-15.6v-104.1h15.6v7.3c6.1-6.1,13.1-9.2,20.9-9.2s16.9,3.4,22.9,10.2c6.1,6.8,9.1,15.3,9.1,25.7s-3,18.5-9.1,25.3c-6,6.7-13.6,10-22.7,10s-14.9-3.2-21.2-9.5v44.2ZM224.2,108.3c0-6.5-1.8-11.7-5.3-15.8-3.6-4.1-8-6.2-13.4-6.2s-10.4,2-13.9,6c-3.6,4-5.3,9.2-5.3,15.6s1.8,11.5,5.3,15.6c3.5,4,8.1,6,13.8,6s9.8-2,13.4-6.1c3.6-4.1,5.4-9.1,5.4-15.2Z"/> <path fill="#ffffff" d="M270.9,88.7v52.9h-15.6v-52.9h-6.6v-14.5h6.6v-24.7h15.6v24.7h12.1v14.5h-12.1Z"/> <path fill="#ffffff" d="M288.3,46.1c0-2.7,1-5.1,3-7.1,2-2,4.4-3,7.1-3s5.2,1,7.2,3c2,1.9,3,4.3,3,7.1s-1,5.2-3,7.2c-1.9,2-4.3,3-7.1,3s-5.2-1-7.2-3c-2-2-3-4.4-3-7.3ZM306.2,74.2v67.4h-15.6v-67.4h15.6Z"/> <path fill="#ffffff" d="M323,74.2h15.6v6.2c3-3.1,5.6-5.3,7.7-6.4,2.3-1.2,5.1-1.7,8.5-1.7,7.6,0,13.6,3.3,18.1,10,4.9-6.6,11.5-10,19.9-10,15.2,0,22.8,9.2,22.8,27.6v41.7h-15.6v-37.4c0-6.5-.8-11-2.4-13.7-1.6-2.7-4.3-4.1-8-4.1s-7.4,1.6-9.4,4.8c-2,3.2-2.9,8.4-2.9,15.6v34.8h-15.6v-37.2c0-12-3.5-18-10.4-18s-7.6,1.6-9.6,4.9c-2,3.3-3,8.4-3,15.5v34.8h-15.6v-67.4Z"/> <path fill="#ffffff" d="M447.6,74.2v38.7c0,11.2,4.4,16.7,13.2,16.7s13.2-5.6,13.2-16.7v-38.7h15.6v39c0,5.4-.7,10.1-2,14-1.3,3.5-3.5,6.7-6.7,9.5-5.3,4.6-11.9,6.8-20.1,6.8s-14.7-2.3-20-6.8c-3.2-2.8-5.5-6-6.8-9.5-1.3-3.1-1.9-7.8-1.9-14v-39h15.6Z"/> <path fill="#ffffff" d="M545.5,85.6l-12.9,6.8c-2-4.2-4.5-6.2-7.5-6.2s-2.7.5-3.7,1.4c-1,.9-1.5,2.2-1.5,3.6,0,2.6,3,5.1,9,7.7,8.3,3.6,13.8,6.8,16.7,9.8,2.9,3,4.3,7,4.3,12.1s-2.4,11.9-7.2,16.3c-4.7,4.2-10.3,6.2-16.9,6.2-11.3,0-19.3-5.5-24-16.5l13.3-6.2c1.8,3.2,3.3,5.3,4.2,6.2,1.9,1.8,4.2,2.6,6.8,2.6,5.3,0,7.9-2.4,7.9-7.2s-2-5.3-6.1-7.7c-1.6-.8-3.1-1.5-4.7-2.3-1.6-.7-3.2-1.5-4.8-2.3-4.5-2.2-7.7-4.4-9.5-6.6-2.4-2.8-3.5-6.4-3.5-10.9s2-10.7,6-14.5c4.1-3.8,9.1-5.7,14.9-5.7,8.6,0,15,4.5,19.2,13.4Z"/> </g> <g> <path fill="#7cea9c" d="M207.4,149.9l-4.6,27.9h-4.9l4.6-27.9h4.9Z"/> <path fill="#7cea9c" d="M214,178.2c-1.6,0-3-.4-4.2-1.3-1.2-.8-2-2.1-2.5-3.7-.5-1.6-.5-3.6-.1-5.8.4-2.3,1.1-4.3,2.1-5.9,1-1.6,2.3-2.8,3.7-3.6s3-1.2,4.6-1.2,2.2.2,2.9.6c.7.4,1.3.9,1.6,1.5.4.6.6,1.1.8,1.6h.2l.6-3.5h4.9l-3.5,20.9h-4.8l.5-3.3h-.3c-.3.5-.8,1.1-1.4,1.6-.6.6-1.3,1.1-2.1,1.5s-1.9.6-3.1.6ZM216,174.2c1.1,0,2-.3,2.8-.9.8-.6,1.5-1.4,2.1-2.4.6-1,.9-2.2,1.2-3.6s.2-2.5,0-3.5c-.2-1-.6-1.8-1.3-2.3-.6-.6-1.5-.8-2.6-.8s-2.1.3-2.9.9c-.8.6-1.5,1.4-2.1,2.4s-.9,2.2-1.1,3.4c-.2,1.3-.2,2.5,0,3.5.2,1,.6,1.8,1.3,2.4.6.6,1.5.9,2.6.9Z"/> <path fill="#7cea9c" d="M239.9,178.2c-1.2,0-2.2-.2-3-.6s-1.3-.9-1.7-1.5-.7-1.1-.9-1.6h-.3l-.6,3.4h-4.8l4.6-27.9h4.9l-1.8,10.4h.2c.3-.5.8-1.1,1.3-1.7.5-.6,1.2-1.1,2-1.5s1.8-.6,3-.6,2.7.3,3.8,1c1.1.6,1.9,1.6,2.6,2.8s.9,2.8.9,4.5-.2,3.1-.7,4.6-1.1,3-1.9,4.3-1.9,2.3-3.2,3.1c-1.3.8-2.8,1.2-4.5,1.2ZM238.7,174.2c1.1,0,2.1-.3,2.9-.9.8-.6,1.5-1.3,2.1-2.2s1-1.9,1.2-2.9c.3-1,.4-2,.4-3,0-1.4-.3-2.5-.9-3.3-.6-.8-1.6-1.2-2.9-1.2s-2,.3-2.9.8-1.5,1.2-2.1,2.1c-.5.9-1,1.8-1.2,2.9-.3,1.1-.4,2.1-.4,3.1s.3,2.5.9,3.4c.6.8,1.6,1.2,2.8,1.2Z"/> <path fill="#7cea9c" d="M259.1,178.2c-1.6,0-3-.2-4.2-.7s-2.1-1.1-2.8-2c-.7-.9-1.1-1.9-1.2-3.1,0,0,0-.1,0-.2,0,0,0-.1,0-.2l4.6-.5c.1,1,.4,1.8,1,2.2.6.5,1.5.7,2.6.7s1.5-.1,2.2-.4,1.2-.6,1.7-1c.4-.4.7-.9.7-1.4s0-1-.4-1.4c-.4-.4-1-.6-1.9-.8l-3.4-.8c-1.8-.4-3.2-1.1-4-2.1-.8-1-1.2-2.2-1-3.7.1-1.3.6-2.5,1.5-3.5.9-1,2-1.7,3.3-2.2s2.8-.8,4.4-.8c2.3,0,4.1.5,5.3,1.4,1.2.9,2,2.1,2.2,3.6,0,0,0,.2,0,.3,0,0,0,.2,0,.3l-4.4.5c-.1-.7-.4-1.3-.9-1.8-.5-.5-1.3-.7-2.4-.7s-1.4.1-2,.3-1.2.5-1.6.9c-.4.4-.7.9-.7,1.4,0,.5,0,1,.4,1.4.4.4,1,.6,2,.9l3.4.7c1.8.4,3.2,1.1,4,2s1.2,2.1,1,3.6c-.1,1-.4,2-1,2.8-.5.8-1.3,1.5-2.2,2.1-.9.6-1.9,1-3.1,1.4-1.1.3-2.3.5-3.6.5Z"/> </g> </svg>${
     withScope ? `<div class="scope">${esc(w.scope)}</div>` : ''
   }</header>`;
 }
@@ -135,7 +160,7 @@ function formView(w) {
 }
 
 function pageHtml(p, selfTest) {
-  return `<!doctype html><html><head><meta charset="utf-8"><style>${STYLE}</style></head><body>
+  return `<!doctype html><html><head><meta charset="utf-8"><style>${fontFace()}${STYLE}</style></head><body>
   <div class="card" id="card">${formView(p.words)}</div>
   <script>
     const post = (m) => window.webkit.messageHandlers.optimus.postMessage(JSON.stringify(m));
@@ -144,10 +169,39 @@ function pageHtml(p, selfTest) {
     document.querySelectorAll('[data-open]').forEach((b) => b.onclick = () => post({ action: 'open', agent: b.dataset.open, bundle_id: b.dataset.bundle }));
     document.addEventListener('keydown', (e) => { if (e.key === 'Escape') post({ action: 'cancel' }); });
     window.addEventListener('load', size);
+    // The web view keeps every click, so the window is moved from here: pressing the header (the
+    // logo bar, where a title bar would be) sends how far the pointer has moved on the screen.
+    const head = document.querySelector('header');
+    let from = null;
+    head.addEventListener('pointerdown', (e) => {
+      from = { x: e.screenX, y: e.screenY };
+      head.setPointerCapture(e.pointerId);
+      post({ type: 'drag', phase: 'start' });
+    });
+    head.addEventListener('pointermove', (e) => {
+      if (from) post({ type: 'drag', dx: e.screenX - from.x, dy: e.screenY - from.y });
+    });
+    const stop = () => { from = null; };
+    head.addEventListener('pointerup', stop);
+    head.addEventListener('pointercancel', stop);
     ${selfTest ? "window.addEventListener('load', () => setTimeout(() => post({ action: 'cancel' }), 300));" : ''}
   </script></body></html>`;
 }
 
+/** Where the window was when the header was pressed. */
+let dragOrigin = null;
+
+/** Move the window by how far the pointer has moved since the header was pressed (screen y is down). */
+function dragWindow(win, m) {
+  if (m.phase === 'start') {
+    const frame = win.frame;
+    dragOrigin = { x: frame.origin.x, y: frame.origin.y };
+    return;
+  }
+  if (!dragOrigin || typeof m.dx !== 'number' || typeof m.dy !== 'number') return;
+  win.setFrameOrigin($.NSMakePoint(dragOrigin.x + m.dx, dragOrigin.y - m.dy));
+}
+
 function place(win, height) {
   win.setContentSize($.NSMakeSize(WIDTH, Math.min(Math.max(height, 120), 900)));
   win.center;
@@ -175,6 +229,10 @@ function run(argv) {
             place(win, m.height);
             return;
           }
+          if (m.type === 'drag') {
+            dragWindow(win, m);
+            return;
+          }
           result = m;
         },
       },

package/dist/log_config_files/collection/plugin_collector.js

@@ -20,11 +20,24 @@ const SKILL_MAX_FILE_BYTES = 1024 * 1024;
 const SKILL_MAX_TOTAL_BYTES = 8 * 1024 * 1024;
 const SKILL_MAX_FILES = 500;
 const SKILL_MAX_DEPTH = 8;
+// Credential-shaped names, lower case: the backend skill bundle's rule (_is_secret_name) and its
+// credential files (CredentialFiles.FILE_NAMES), which it never stores the content of (OPT-1016).
+const SECRET_NAMES = new Set([
+    '.env', '.npmrc', '.netrc', '.pgpass', '.git-credentials', '.htpasswd',
+    'credentials', 'credentials.json', '.credentials.json', 'auth.json', 'auth.v2.file',
+    'oauth_creds.json', 'mcp-auth.json', 'mcp_oauth_tokens.json',
+    'id_rsa', 'id_dsa', 'id_ecdsa', 'id_ed25519',
+    'secrets.json', 'secrets.yaml', 'secrets.yml', 'secrets.toml', 'secrets.env',
+]);
+const SECRET_SUFFIXES = ['.pem', '.key', '.p12', '.pfx', '.jks', '.keystore'];
 /** Hidden files are collected, but credential-shaped ones are recorded without their contents. */
 function isSecretName(name) {
     const lower = name.toLowerCase();
-    return lower === '.env' || lower.startsWith('.env.') || lower === '.npmrc' || lower === '.netrc'
-        || lower === '.pgpass' || lower.endsWith('.pem') || lower.endsWith('.key');
+    if (SECRET_NAMES.has(lower) || lower.startsWith('.env.') || SECRET_SUFFIXES.some((s) => lower.endsWith(s)))
+        return true;
+    // Cloud credential files: OAuth client secrets and service-account keys.
+    return lower.endsWith('.json')
+        && (lower.startsWith('client_secret') || lower.startsWith('service-account') || lower.includes('serviceaccount'));
 }
 function skillMetaRecord(filePath, size, sha256, ver) {
     return {
@@ -34,72 +47,74 @@ function skillMetaRecord(filePath, size, sha256, ver) {
         raw_content: { source: 'file', size, ...(sha256 ? { sha256 } : {}), ...(ver ? { version: ver } : {}) },
     };
 }
-function collectSkillDirFiles(dir, results, constants, skillFilename, budget, depth) {
-    if (depth > SKILL_MAX_DEPTH)
-        return;
-    let entries;
+function readSkillDir(dir) {
     try {
-        entries = readdirSync(dir, { withFileTypes: true });
+        return readdirSync(dir, { withFileTypes: true });
     }
     catch (err) {
         console.warn(`Error reading skill dir ${dir}:`, err instanceof Error ? err.message : String(err));
-        return;
+        return null;
+    }
+}
+function sha256Of(full) {
+    try {
+        return createHash('sha256').update(readFileSync(full)).digest('hex');
+    }
+    catch {
+        return null;
     }
-    for (const ent of entries) {
+}
+/** One extra skill file as a record, or null when it is skipped or unreadable. */
+function skillFileRecord(full, name, constants) {
+    const ext = extname(name).toLowerCase();
+    if (SKILL_SKIP_EXTS.has(ext))
+        return null;
+    let size;
+    try {
+        size = statSync(full).size;
+    }
+    catch {
+        return null;
+    }
+    const ver = versionFromPluginCachePath(full, constants);
+    // A credential file's bytes are never read, so it is checked before the size cap and the hash.
+    if (isSecretName(name) || size > SKILL_MAX_FILE_BYTES)
+        return skillMetaRecord(full, size, '', ver);
+    if (!SKILL_TEXT_EXTS.has(ext)) {
+        const sha256 = sha256Of(full);
+        return sha256 === null ? null : skillMetaRecord(full, size, sha256, ver);
+    }
+    const content = readMarkdownFile(full);
+    if (content === null)
+        return null;
+    return { file_type: 'claude_skill', file_path: full, raw_content: { content, source: 'file', ...(ver ? { version: ver } : {}) } };
+}
+function collectSkillDirFiles(dir, results, constants, skillFilename, budget, depth) {
+    if (depth > SKILL_MAX_DEPTH)
+        return;
+    for (const ent of readSkillDir(dir) ?? []) {
         if (budget.files >= SKILL_MAX_FILES || budget.bytes >= SKILL_MAX_TOTAL_BYTES)
             return;
         const full = join(dir, ent.name);
-        if (ent.isDirectory()) {
-            if (!SKILL_SKIP_DIRS.has(ent.name))
-                collectSkillDirFiles(full, results, constants, skillFilename, budget, depth + 1);
+        if (ent.isDirectory() && !SKILL_SKIP_DIRS.has(ent.name)) {
+            collectSkillDirFiles(full, results, constants, skillFilename, budget, depth + 1);
             continue;
         }
-        if (ent.name === skillFilename)
-            continue;
         // Extra skill files: skip nested symlinks so the walk stays inside this skill dir.
-        if (!ent.isFile())
-            continue;
-        const ext = extname(ent.name).toLowerCase();
-        if (SKILL_SKIP_EXTS.has(ext))
-            continue;
-        let size;
-        try {
-            size = statSync(full).size;
-        }
-        catch {
-            continue;
-        }
-        const ver = versionFromPluginCachePath(full, constants);
-        if (size > SKILL_MAX_FILE_BYTES) {
-            results.push(skillMetaRecord(full, size, '', ver));
-            budget.files += 1;
+        if (ent.name === skillFilename || !ent.isFile())
             continue;
-        }
-        if (!SKILL_TEXT_EXTS.has(ext) && ent.name !== skillFilename) {
-            let sha256 = '';
-            try {
-                sha256 = createHash('sha256').update(readFileSync(full)).digest('hex');
-            }
-            catch {
-                continue;
-            }
-            results.push(skillMetaRecord(full, size, sha256, ver));
-            budget.files += 1;
-            continue;
-        }
-        if (isSecretName(ent.name)) {
-            results.push(skillMetaRecord(full, size, '', ver));
-            budget.files += 1;
-            continue;
-        }
-        const content = readMarkdownFile(full);
-        if (content === null)
-            continue;
-        results.push({ file_type: 'claude_skill', file_path: full, raw_content: { content, source: 'file', ...(ver ? { version: ver } : {}) } });
-        budget.files += 1;
-        budget.bytes += Buffer.byteLength(content);
+        addSkillRecord(skillFileRecord(full, ent.name, constants), results, budget);
     }
 }
+function addSkillRecord(record, results, budget) {
+    if (!record)
+        return;
+    results.push(record);
+    budget.files += 1;
+    const content = record.raw_content.content;
+    if (typeof content === 'string')
+        budget.bytes += Buffer.byteLength(content);
+}
 function collectSkillFiles(skillsDir, results, constants) {
     const skillFilename = getPluginSkillFilename(constants);
     try {
@@ -228,4 +243,4 @@ function collectConfigFilesFromInstalledPlugins(constants) {
     }
     return results;
 }
-export { collectConfigFilesFromInstalledPlugins, collectPluginCacheMcpFiles };
+export { collectConfigFilesFromInstalledPlugins, collectPluginCacheMcpFiles, isSecretName };

package/dist/log_config_files/runtime/client_event_reporter.js

@@ -20,6 +20,7 @@ import { createSignature } from '../sender/signing.js';
 import { readStoredAuthKey } from '../auth/auth_key_store.js';
 import { resolveHardwareUuid } from './hardware_uuid.js';
 import { buildLogMetadataObject } from './log_metadata.js';
+import { SCRUBBER_VERSION, scrubFields } from '../../pii_scrub.js';
 const CLIENT_EVENT_PATH = '/endpoint_security/api/client-event/';
 const SEND_TIMEOUT_MS = 4000;
 const BUFFER_BASENAME = 'client_events.jsonl';
@@ -198,6 +199,16 @@ function claimBufferedEvents() {
         return [];
     }
 }
+/**
+ * An event as it is sent: its free-text fields (a failure's log, a command line, an error and its
+ * stack) scrubbed like tool-call content, and the scrubber's version in its metadata. Buffered
+ * events are scrubbed here too, on their way out.
+ */
+function forWire(event) {
+    const scrubbed = scrubFields(event, ['command', 'message', 'detail', 'log_text']);
+    const metadata = (event.metadata ?? {});
+    return { ...scrubbed, metadata: { ...metadata, scrubber_version: SCRUBBER_VERSION } };
+}
 async function postEvents(events) {
     if (events.length === 0)
         return true;
@@ -210,7 +221,7 @@ async function postEvents(events) {
     }
     const base = loadEndpointBase().replace(/\/+$/, '');
     const url = `${base}${CLIENT_EVENT_PATH}`;
-    const signingPayload = { hardware_uuid: hardwareUuid, events };
+    const signingPayload = { hardware_uuid: hardwareUuid, events: events.map(forWire) };
     let signature = '';
     try {
         const authKey = readStoredAuthKey();

package/dist/log_config_files/runtime/compliance_session_log.js

@@ -3,6 +3,7 @@ import path from 'node:path';
 import { homedir } from 'node:os';
 import { OPTIMUSLABS_LOGS_REL, LOG_GROUP_COMPLIANCE } from '../../bootstrap_constants.js';
 import { buildLogMetadataBlock } from './log_metadata.js';
+import { SCRUBBER_VERSION, scrubText } from '../../pii_scrub.js';
 const COMPLIANCE_SUBDIR = LOG_GROUP_COMPLIANCE;
 const TIER_NOOP = 'noop';
 const TIER_SUCCESS = 'success';
@@ -318,19 +319,27 @@ function appendLineToSessionLogFile(logPath, message) {
 /**
  * Upload full session log to the server (success and failures tiers only, first finalize only).
  */
-export async function uploadComplianceSessionLogFromFinalize(result) {
+/** The session log to upload, or null when this finalize does not upload one (and why is logged). */
+function sessionLogToUpload(result) {
     if (result.tier !== TIER_SUCCESS && result.tier !== TIER_FAILURES)
-        return;
+        return null;
     if (!result.moved)
-        return;
+        return null;
     const logText = readComplianceSessionLog(result.logPath);
     if (!logText.trim())
-        return;
+        return null;
     const logBytes = Buffer.byteLength(logText, 'utf8');
     if (logBytes > MAX_SESSION_LOG_UPLOAD_BYTES) {
         appendLineToSessionLogFile(result.logPath, `compliance_session_upload: skipped (${logBytes} bytes exceeds ${MAX_SESSION_LOG_UPLOAD_BYTES})`);
-        return;
+        return null;
     }
+    return { logText, logBytes };
+}
+export async function uploadComplianceSessionLogFromFinalize(result) {
+    const toUpload = sessionLogToUpload(result);
+    if (!toUpload)
+        return;
+    const { logText, logBytes } = toUpload;
     const { readStoredAuthKey } = await import('../auth/auth_key_store.js');
     const { tryResolveHardwareUuid } = await import('./hardware_uuid.js');
     const { loadEndpointBase } = await import('../sender/endpoint_config.js');
@@ -349,10 +358,11 @@ export async function uploadComplianceSessionLogFromFinalize(result) {
         hardware_uuid: hardwareUuid,
         outcome,
         session_filename: sessionFilename,
-        log_text: logText,
+        // Signed as scrubbed; the version sits outside the signed fields.
+        log_text: scrubText(logText),
     };
     const signature = createSignature(signingPayload, authKey.key);
-    const body = JSON.stringify({ ...signingPayload, signature });
+    const body = JSON.stringify({ ...signingPayload, scrubber_version: SCRUBBER_VERSION, signature });
     const url = buildApiUrl(loadEndpointBase(), '/endpoint_security/api/remediation-activity-log/');
     try {
         const { statusCode } = await executeBody(url, 'POST', body, 30_000);

package/dist/log_config_files/runtime/prompt-collection-policy.js

@@ -30,23 +30,59 @@ function collectPromptsFromConfig(cfg) {
 export function readCollectPrompts() {
     return collectPromptsFromConfig(readOrgConfig());
 }
-export function persistCollectPrompts(value) {
-    if (typeof value !== "boolean")
-        return;
+/** The org's fingerprint key: hex, at least 128 bits. Keys the prompt hash and secret fingerprints. */
+const FINGERPRINT_KEY = /^(?:[0-9a-f]{2}){16,}$/i;
+/**
+ * The org key the backend sends in the startup and inventory responses (`fingerprint_key`),
+ * or undefined until it has arrived: the prompt hash stays plain SHA-256 and secrets get no
+ * fingerprint until then.
+ */
+export function readFingerprintKey() {
+    const key = readOrgConfig().fingerprint_key;
+    return typeof key === "string" && FINGERPRINT_KEY.test(key) ? key : undefined;
+}
+function writeOrgConfig(update) {
     const filePath = orgConfigPath();
     try {
         fs.mkdirSync(path.dirname(filePath), { recursive: true });
-        const next = { ...readOrgConfig(), collect_prompts: value };
-        delete next.hash_tool_call_prompts;
-        fs.writeFileSync(filePath, `${JSON.stringify(next)}\n`, { encoding: "utf8", mode: 0o600 });
+        fs.writeFileSync(filePath, `${JSON.stringify(update(readOrgConfig()))}\n`, { encoding: "utf8", mode: 0o600 });
     }
     catch {
         // Best-effort: next heartbeat can retry.
     }
 }
+export function persistCollectPrompts(value) {
+    if (typeof value !== "boolean")
+        return;
+    writeOrgConfig((current) => {
+        const next = { ...current, collect_prompts: value };
+        delete next.hash_tool_call_prompts;
+        return next;
+    });
+}
+function persistFingerprintKey(value) {
+    if (typeof value !== "string" || !FINGERPRINT_KEY.test(value) || value === readFingerprintKey())
+        return;
+    writeOrgConfig((current) => ({ ...current, fingerprint_key: value }));
+}
+/**
+ * Whether the organization scrubs what endpoints send (OPT-942), read by `@optimuslabs/pii-scrub`
+ * from this file: only an explicit `false` switches scrubbing off.
+ */
+function persistScrubPii(value) {
+    if (typeof value !== "boolean" || readOrgConfig().scrub_pii === value)
+        return;
+    writeOrgConfig((current) => ({ ...current, scrub_pii: value }));
+}
+/**
+ * Store the org options a startup or inventory response carries: prompt collection, the org key
+ * and whether to scrub.
+ */
 export function persistCollectPromptsFromResponse(body) {
     if (!body || typeof body !== "object")
         return;
+    persistFingerprintKey(body.fingerprint_key);
+    persistScrubPii(body.scrub_pii);
     if (typeof body.collect_prompts === "boolean") {
         persistCollectPrompts(body.collect_prompts);
         return;

package/dist/log_config_files/runtime/remediation_sync.js

@@ -16,6 +16,8 @@ import { clearRemediationApplyQuarantine, readRemediationApplyTrackingFile, writ
 import { CURSOR_SCALAR_ITEMTABLE_FIELDS, buildVscdbPostApplyRawContent, persistVscdbComposerContractFromPatternsResponse, } from '../readers/vscdb_reader.js';
 import { sendConfigFile } from '../sender/batch_sender.js';
 import { parseWorktreeRootFromPath } from './worktree_scanner.js';
+import { SCRUBBER_VERSION, containsPlaceholder, scrubValue } from '../../pii_scrub.js';
+import { readFingerprintKey } from './prompt-collection-policy.js';
 import { reportAbsentWorktrees } from './worktree_absent.js';
 import { buildApiUrl, getFileCollectionPatterns } from '../../endpoint_client/registry_api.js';
 import { resolveRemediationConfigPath } from './remediation_config_path.js';
@@ -69,8 +71,21 @@ function readInstructions() {
     const { remediations } = readRemediationInstructionsFile();
     return { remediations: remediations };
 }
+/**
+ * Instructions whose fix would write a scrubbed placeholder are never stored, so never applied.
+ * The server holds only the scrubbed copy of a config; writing a placeholder back would replace
+ * the user's real key or token with `[OL_REDACTED:...]`.
+ */
+function withoutScrubbedFixes(remediations) {
+    return remediations.filter((inst) => {
+        if (!containsPlaceholder(remediationFixSpec(inst)?.checks ?? []))
+            return true;
+        hookRunLog(`remediation_instructions_skipped: uuid=${inst.uuid} reason=fix carries a scrubbed placeholder`);
+        return false;
+    });
+}
 function writeInstructions(file) {
-    writeRemediationInstructionsFile(file);
+    writeRemediationInstructionsFile({ ...file, remediations: withoutScrubbedFixes(file.remediations) });
 }
 /**
  * Merge persisted rows with API overlay; GET manifest for enforced UUIDs still missing rows.
@@ -1577,12 +1592,12 @@ export function reportAutofixApplied(remediationUuid, result, details) {
         payload.failure_reason = details.failure_reason.slice(0, 2000);
     if (details?.consecutive_failures != null)
         payload.consecutive_failures = details.consecutive_failures;
-    const bodyPayload = { ...payload, signature: '' };
+    const bodyPayload = { ...payload, scrubber_version: SCRUBBER_VERSION, signature: '' };
     if (details?.config_snapshot_after && typeof details.config_snapshot_after === 'object') {
-        bodyPayload.config_snapshot_after = details.config_snapshot_after;
+        bodyPayload.config_snapshot_after = scrubValue(details.config_snapshot_after, { fingerprintKey: readFingerprintKey() });
     }
     if (details?.config_snapshot_before && typeof details.config_snapshot_before === 'object') {
-        bodyPayload.config_snapshot_before = details.config_snapshot_before;
+        bodyPayload.config_snapshot_before = scrubValue(details.config_snapshot_before, { fingerprintKey: readFingerprintKey() });
     }
     const signature = createSignature(payload, authKey.key);
     const body = JSON.stringify({ ...bodyPayload, signature });

package/dist/log_config_files/runtime/workspace_repo.js

@@ -3,9 +3,10 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { hookRunLog } from './hook_logger.js';
+import { scrubText } from '../../pii_scrub.js';
 const GIT_TIMEOUT_MS = 3000;
 const MAX_WALK_UP = 25;
-function gitRemoteInDir(dir) {
+function readGitRemote(dir) {
     try {
         return execFileSync('git', ['remote', '-v'], {
             cwd: dir,
@@ -18,6 +19,13 @@ function gitRemoteInDir(dir) {
         return '';
     }
 }
+/**
+ * `git remote -v` in `dir`. A remote can embed a token (`https://user:token@host/owner/repo`), so
+ * it is scrubbed here, where every remote this package reports comes from; host and path stay.
+ */
+function gitRemoteInDir(dir) {
+    return scrubText(readGitRemote(dir));
+}
 function gitToplevelFromDir(dir) {
     try {
         return execFileSync('git', ['rev-parse', '--show-toplevel'], {
@@ -51,7 +59,7 @@ export function resolveWorkspaceRepoFromEnv() {
     ]) {
         const value = (candidate || '').trim();
         if (value)
-            return value;
+            return scrubText(value);
     }
     return '';
 }

package/dist/log_config_files/sender/batch_sender.js

@@ -4,7 +4,8 @@ import { loadEndpointBase } from './endpoint_config.js';
 import { hookRunLog } from '../runtime/hook_logger.js';
 import { canonicalCursorUserStateVscdbPath } from '../runtime/remediation_config_path.js';
 import { resolveWorkspaceRepoFromEnv } from '../runtime/workspace_repo.js';
-import { persistCollectPromptsFromResponse } from '../runtime/prompt-collection-policy.js';
+import { persistCollectPromptsFromResponse, readFingerprintKey } from '../runtime/prompt-collection-policy.js';
+import { SCRUBBER_VERSION, scrubText, scrubValue } from '../../pii_scrub.js';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
@@ -84,7 +85,8 @@ function buildChunkBody(chunk, hardwareUuid, authKey, hookRequestId, metadata) {
         const item = {
             file_type: c.file_type,
             file_path: canonicalCursorUserStateVscdbPath(c.file_path),
-            raw_content: c.raw_content,
+            raw_content: scrubValue(c.raw_content, { fingerprintKey: readFingerprintKey() }),
+            scrubber_version: SCRUBBER_VERSION,
         };
         if (c.symlink_info !== undefined)
             item.symlink_info = c.symlink_info;
@@ -227,11 +229,11 @@ async function sendConfigFile(configFile, hardwareUuid, authKey, repoIdentifier)
     const endpoint = loadEndpointBase();
     const apiUrl = `${resolveApiBase(endpoint)}/endpoint_security/log-config-file/`;
     const uploadPath = canonicalCursorUserStateVscdbPath(configFile.file_path);
-    const payload = { hardware_uuid: hardwareUuid, file_type: configFile.file_type, file_path: uploadPath, raw_content: configFile.raw_content };
+    const payload = { hardware_uuid: hardwareUuid, file_type: configFile.file_type, file_path: uploadPath, raw_content: scrubValue(configFile.raw_content, { fingerprintKey: readFingerprintKey() }) };
     if (configFile.symlink_info !== undefined)
         payload.symlink_info = configFile.symlink_info;
     const signature = createSignature(payload, authKey.key);
-    const body = { ...payload, signature, key_id: authKey.key_id || '', metadata: { org_identifier: process.env.GITHUB_ORG || process.env.GH_ORG || '', organization_uuid: readOrganizationUuid(), repo_identifier: repoIdentifier ?? resolveWorkspaceRepoFromEnv() } };
+    const body = { ...payload, signature, key_id: authKey.key_id || '', metadata: { org_identifier: process.env.GITHUB_ORG || process.env.GH_ORG || '', organization_uuid: readOrganizationUuid(), repo_identifier: repoIdentifier ?? resolveWorkspaceRepoFromEnv(), scrubber_version: SCRUBBER_VERSION } };
     try {
         const response = await postStartupPayload(apiUrl, body);
         if (response.status !== 'accepted') {
@@ -273,8 +275,10 @@ async function sendHookRequestUpdateManifest(hardwareUuid, authKey, hookRequestI
     const payload = { hardware_uuid: hardwareUuid, hook_request_id: hookRequestId, manifest: manifestNormalized };
     const signature = createSignature(payload, authKey.key);
     const body = { ...payload, signature, key_id: authKey.key_id || '' };
+    // The hook's log holds its whole environment: scrubbed, outside the signed manifest.
     if (hookLog)
-        body.hook_log = hookLog;
+        body.hook_log = scrubText(hookLog);
+    body.scrubber_version = SCRUBBER_VERSION;
     try {
         const data = (await patchPayload(apiUrl, body));
         if (data.status === 'accepted') {

package/dist/log_uuid/startup_sender.js

@@ -4,6 +4,7 @@ import { flushBufferedClientEvents, getStoryId, reportFunctionalFailureAwait, re
 import { resolveHardwareUuid } from './hardware_uuid.js';
 import { writeAuthKey, readStoredAuthKey, loadEndpointBase, buildStartupEndpointUrl } from './auth_key_store.js';
 import { resolveUserProfile } from './user_profile.js';
+import { SCRUBBER_VERSION } from '../pii_scrub.js';
 import { resolveWorkspaceRepo } from '../log_config_files/runtime/workspace_repo.js';
 import { collectInstalledHookHashes } from './installed_hook_hashes.js';
 import { persistCollectPromptsFromResponse } from '../log_config_files/runtime/prompt-collection-policy.js';
@@ -62,6 +63,7 @@ const getMetadata = () => ({
     user_profile: { ...resolveUserProfile() },
     // Every installed agent's hooks from disk, not just the launching agent's (OPTIMUS_HOOK_MANIFEST).
     hook_manifest: { ...parseHookManifest(), ...collectInstalledHookHashes() },
+    scrubber_version: SCRUBBER_VERSION,
 });
 function buildRequestBody(hardwareUuid, timestamp) {
     const metadata = getMetadata();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimuslabs/harness-map-staging",
-  "version": "1.5.44",
+  "version": "1.5.46",
   "description": "CLI helpers for logging hardware UUIDs and posting startup payloads to Optimus Security.",
   "type": "module",
   "bin": {
@@ -15,11 +15,11 @@
     "dialog_prefs-staging": "dist/cli.js"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.json && node ../../../scripts/ensure-bin-executable.mjs && node -e \"const fs=require('fs');fs.mkdirSync('dist/agent_block_window',{recursive:true});fs.copyFileSync('src/agent_block_window/agent_block_window.jxa','dist/agent_block_window/agent_block_window.jxa')\"",
+    "build": "tsc -p tsconfig.json && node ../../../scripts/ensure-bin-executable.mjs && node -e \"const fs=require('fs');fs.mkdirSync('dist/agent_block_window',{recursive:true});for(const f of ['agent_block_window.jxa','manrope-latin-wght-normal.woff2','Manrope-OFL.txt'])fs.copyFileSync('src/agent_block_window/'+f,'dist/agent_block_window/'+f)\"",
     "dev": "ts-node src/cli.ts",
     "lint": "eslint \"src/**/*.ts\"",
     "prepare": "npm run build",
-    "pretest": "npm run build",
+    "pretest": "npm run build --prefix ../pii-scrub && npm run build",
     "test": "vitest run",
     "test:watch": "vitest"
   },
@@ -56,6 +56,7 @@
     "vitest": "^4.1.12"
   },
   "dependencies": {
+    "@optimuslabs/pii-scrub-staging": "^0.1.0",
     "@optimuslabs/tofu-staging": "^0.1.18",
     "axios": "^1.20.0",
     "canonicalize": "^2.1.0",