v0.2.36.0 fix: the test run's contracts, refusals, save and store, and causes without private paths (Cycle 0050, PR-1 of 3)

.codex/restore-product-context.mjs

@@ -10,25 +10,24 @@ const RESTORED_SECTIONS = ['## Mandatory entry', '## Owner directions in force']
  * Returns one `## ` section of AGENTS.md, from its heading to the next `## ` heading.
  *
  * Why: the restored context carries only the sections that order the re-entry and keep the owner's scope, so it stays within the hosts' context limits.
+ * Lines are split on LF or CRLF (a Git for Windows checkout) and a heading matches despite trailing spaces or tabs; the section's own lines keep their trailing spaces, so a Markdown hard break is restored verbatim (F268).
  * Caller: {@link restoreProductContext}.
  *
  * @param instructions - The current AGENTS.md text.
- * @param heading - The exact `## ` heading line.
- * @returns The section text without trailing blank lines.
- * @throws When the heading is missing, so that a renamed section never restores silently without it.
+ * @param heading - The `## ` heading line.
+ * @returns The section text without trailing blank lines, or `undefined` when the heading is missing (renamed or removed).
  * @example
- * sectionOf('# A\n\n## Mandatory entry\n\nRead.\n\n## Next\n', '## Mandatory entry') // => '## Mandatory entry\n\nRead.'
+ * sectionOf('# A\r\n\r\n## Mandatory entry \r\n\r\nRead.\r\n\r\n## Next\r\n', '## Mandatory entry') // => '## Mandatory entry\n\nRead.'
  */
 function sectionOf(instructions, heading) {
-  const lines = instructions.split('\n')
-  const start = lines.indexOf(heading)
-  if (start === -1)
-    throw new Error(`AGENTS.md is missing its ${heading.slice(3)} section.`)
+  const lines = instructions.split(/\r?\n/)
+  // Only the heading is compared without its trailing spaces; the section's lines are restored as they are, a Markdown hard break included.
+  const start = lines.findIndex((line) => line.trimEnd() === heading)
+  if (start === -1) return undefined
   const next = lines.findIndex(
     (line, index) => index > start && line.startsWith('## '),
   )
-  return lines
-    .slice(start, next === -1 ? lines.length : next)
+  return [heading, ...lines.slice(start + 1, next === -1 ? lines.length : next)]
     .join('\n')
     .trimEnd()
 }
@@ -57,11 +56,23 @@ async function restoreProductContext() {
     "The owner's most important rule: before any other work after this compaction, whatever the task, read PRODUCT_GOAL.md in full, every line, and open the approved PNG (docs/designs/assets/codebook-product-spec-v9.png) with an image-viewing tool and check its identity against PRODUCT_GOAL.md's Design target; then read the active cycle Issue (the open Issue with the label `cycle`) with its comments and AGENTS.md in full from disk. A compacted summary or this reminder is not evidence of those reads or of the image inspection.",
     'Reconcile the current source and affected acceptance gaps, then resume the latest owner-authorized task. Preserve pending owner instructions and any explicit pause; this reminder grants no additional work scope.',
   ]
-  const sections = RESTORED_SECTIONS.map((heading) =>
-    sectionOf(instructions, heading),
+  const found = RESTORED_SECTIONS.map((heading) => ({
+    heading,
+    text: sectionOf(instructions, heading),
+  }))
+  const missing = found.filter((section) => section.text === undefined)
+  const sections = found.flatMap((section) =>
+    section.text === undefined ? [] : [section.text],
   )
+  // A renamed or removed section must never leave the owner's rule unprinted: the rule goes out, with the sections that were found, and names what is missing.
+  const missingNote = missing.length
+    ? [
+        `AGENTS.md has no ${missing.map((section) => section.heading.slice(3)).join(' or ')} section under that exact heading; read AGENTS.md in full on disk now.`,
+      ]
+    : []
   const full = [
     ...rule,
+    ...missingNote,
     'These AGENTS.md sections follow verbatim; read the whole file on disk and resolve its relative links from the repository root:',
     ...sections,
   ].join('\n\n')
@@ -71,8 +82,13 @@ async function restoreProductContext() {
       ? full
       : [
           ...rule,
+          ...missingNote,
           `AGENTS.md's ${RESTORED_SECTIONS.map((heading) => heading.slice(3)).join(' and ')} sections exceed this reminder's ${MAX_CONTEXT_CHARS}-character limit; read them in AGENTS.md on disk now.`,
         ].join('\n\n')
+  if (missing.length)
+    process.stderr.write(
+      `Codebook context restoration: AGENTS.md is missing its ${missing.map((section) => section.heading.slice(3)).join(' and ')} section.\n`,
+    )
   process.stdout.write(
     JSON.stringify({
       hookSpecificOutput: {

.codex/restore-product-context.test.mjs

@@ -80,11 +80,13 @@ test('compaction restores the re-entry rule and the Mandatory entry and Owner di
     context.length <= 10_000,
     `context has ${context.length} characters`,
   )
-  assert.ok(
-    context.indexOf(
-      'read PRODUCT_GOAL.md in full, every line, and open the approved PNG',
-    ) < 2_000,
+  // Both bounds: a missing rule gives -1, which alone would pass `< 2_000` (F84).
+  // The hook's own sentence, not the phrase that AGENTS.md's Mandatory entry section repeats further down.
+  const rulePosition = context.indexOf(
+    "The owner's most important rule: before any other work after this compaction, whatever the task, read PRODUCT_GOAL.md in full, every line, and open the approved PNG",
   )
+  assert.ok(rulePosition >= 0, 'the re-entry rule is missing')
+  assert.ok(rulePosition < 2_000, `the rule starts at ${rulePosition}`)
   assert.ok(context.includes(agentsSection(agents, '## Mandatory entry')))
   assert.ok(
     context.includes(agentsSection(agents, '## Owner directions in force')),
@@ -134,22 +136,83 @@ test('an AGENTS.md whose restored sections outgrow the limit still restores the
   assert.ok(!context.includes('Read the goal.\nRead the goal.'))
 })
 
-// Value: protects=a renamed or removed section being noticed; fails_when=the hook restores a context without the Owner directions section; no_claim=which sections AGENTS.md should have
-test('an AGENTS.md without the Owner directions section reports failure without inventing restored context', () => {
+// Value: protects=the owner's re-entry rule reaching the agent when a restored section is renamed or removed (F74); fails_when=the hook fails or prints nothing instead of printing the rule and naming the missing section; no_claim=which sections AGENTS.md should have
+test('an AGENTS.md without the Owner directions section still restores the rule, the section it has, and names the missing one', () => {
   // Arrange
   const withoutDirections =
     '# codebook agent instructions\n\n## Mandatory entry\n\nRead the goal.\n'
   // Act
   const result = runHookBeside(withoutDirections)
+  const context = JSON.parse(result.stdout).hookSpecificOutput.additionalContext
   // Assert
-  assert.equal(result.status, 1)
-  assert.equal(result.stdout, '')
+  assert.equal(result.status, 0)
+  assert.match(
+    context,
+    /read PRODUCT_GOAL\.md in full, every line, and open the approved PNG/,
+  )
+  assert.ok(context.includes('## Mandatory entry\n\nRead the goal.'))
+  assert.match(
+    context,
+    /AGENTS\.md has no Owner directions in force section under that exact heading; read AGENTS\.md in full on disk now\./,
+  )
   assert.match(
     result.stderr,
     /AGENTS\.md is missing its Owner directions in force section\./,
   )
 })
 
+// Value: protects=the restored sections on a Git for Windows checkout (CRLF) and with trailing spaces after a heading (F74); fails_when=a CRLF or padded heading is not found, so the sections are dropped; no_claim=the wording of the sections
+test('an AGENTS.md with CRLF line ends and padded headings restores both sections whole', () => {
+  // Arrange
+  const crlf = [
+    '# codebook agent instructions',
+    '',
+    '## Mandatory entry  ',
+    '',
+    'Read the goal.',
+    '',
+    '## Owner directions in force\t',
+    '',
+    'Keep the owner scope.',
+    '',
+    '## Native QA',
+    '',
+    'Record windows.',
+    '',
+  ].join('\r\n')
+  // Act
+  const result = runHookBeside(crlf)
+  const context = JSON.parse(result.stdout).hookSpecificOutput.additionalContext
+  // Assert
+  assert.equal(result.status, 0)
+  assert.equal(result.stderr, '')
+  assert.ok(context.includes('## Mandatory entry\n\nRead the goal.'))
+  assert.ok(
+    context.includes('## Owner directions in force\n\nKeep the owner scope.'),
+  )
+  assert.ok(!context.includes('Record windows.'))
+  assert.ok(!context.includes('\r'))
+})
+
+// Value: protects=the owner's rule when every restored heading was renamed (F74); fails_when=the hook prints nothing or fails; no_claim=any section text
+test('an AGENTS.md whose restored headings were all renamed still restores the rule and names both missing sections', () => {
+  // Arrange
+  const renamed = '# codebook agent instructions\n\n## Entry\n\nRead.\n'
+  // Act
+  const result = runHookBeside(renamed)
+  const context = JSON.parse(result.stdout).hookSpecificOutput.additionalContext
+  // Assert
+  assert.equal(result.status, 0)
+  assert.match(
+    context,
+    /read PRODUCT_GOAL\.md in full, every line, and open the approved PNG/,
+  )
+  assert.match(
+    context,
+    /AGENTS\.md has no Mandatory entry or Owner directions in force section under that exact heading/,
+  )
+})
+
 test('startup, resume and other events do not add compaction instructions', () => {
   // Arrange
   const events = [
@@ -196,3 +259,31 @@ test('the repository registers only compaction restoration through a root-resolv
   )
   assert.equal(config.hooks.SessionStart[0].hooks[0].timeout, 5)
 })
+
+// Value: protects=the restored sections staying verbatim: a section line that ends in two spaces (a Markdown hard break) keeps them, while its heading still matches with trailing spaces (F268); fails_when=every line loses its trailing spaces, so the restored text differs from AGENTS.md; why_new=PR-1's /ship Claude adversarial review, cycle 3: the hook trimmed every line to match its headings; seam=none; no_claim=the wording of the sections
+test('a restored section keeps the trailing spaces of its lines', () => {
+  // Arrange
+  const withHardBreak = [
+    '# codebook agent instructions',
+    '',
+    '## Mandatory entry  ',
+    '',
+    'Read the goal,  ',
+    'then the image.',
+    '',
+    '## Owner directions in force',
+    '',
+    'Keep the owner scope.',
+    '',
+  ].join('\n')
+
+  // Act
+  const result = runHookBeside(withHardBreak)
+  const context = JSON.parse(result.stdout).hookSpecificOutput.additionalContext
+
+  // Assert
+  assert.equal(result.status, 0)
+  assert.ok(
+    context.includes('## Mandatory entry\n\nRead the goal,  \nthen the image.'),
+  )
+})

.github/workflows/storage-locks-windows.yml

@@ -65,6 +65,7 @@ on:
       - extension/src/tests/runBoundedQuery.test.ts
       - extension/src/tests/runtime-profileProcesses.test.ts
       - extension/src/tests/utils/answerKernelBootId.ts
+      - extension/src/tests/utils/answeredAtOnce.ts
       - extension/src/tests/utils/createLinkIfAllowed.ts
       - extension/src/tests/utils/fileSystemWhoseLinksResistRemoval.ts
       - extension/src/tests/utils/fileSystemWithLargeFileIds.ts
@@ -79,6 +80,7 @@ on:
       - extension/src/tests/utils/requireOwnPidNamespace.ts
       - extension/src/tests/utils/standInForPs.ts
       - extension/src/tests/utils/startOfKilledWindow.ts
+      - extension/src/tests/utils/within.ts
       - extension/src/tests/withStorageLock.test.ts
       - extension/src/utils/atomicPrivateBytes.ts
       - extension/src/utils/atomicPrivateWrite.ts