@geraldmaron/construct 1.2.0 → 1.2.2

package/lib/hooks/readme-age-check.mjs

@@ -17,11 +17,11 @@
 
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import { execSync } from 'node:child_process';
-import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { emitRoleEvent } from '../roles/hook-emit.mjs';
+import { doctorRoot } from '../config/xdg.mjs';
 
-const STATE_PATH = join(homedir(), '.cx', 'readme-age-state.json');
+const STATE_PATH = join(doctorRoot(), 'readme-age-state.json');
 const STALE_DAYS = 90;
 const SUPPRESS_DAYS = 7;
 

package/lib/hooks/session-optimize.mjs

@@ -14,18 +14,19 @@
  */
 import { readFileSync, existsSync, writeFileSync, mkdirSync, readdirSync, statSync } from 'fs';
 import { join, dirname } from 'path';
-import { homedir } from 'os';
 import { spawn } from 'child_process';
 import { fileURLToPath } from 'url';
 
+import { doctorRoot } from '../config/xdg.mjs';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const CONSTRUCT_BIN = join(__dirname, '..', '..', 'bin', 'construct');
 
 const OPTIMIZATION_THRESHOLD = 0.7;
 const MIN_TRACES_PER_AGENT = 3;
 const OPTIMIZATION_DAYS = 7;
-const OPTIMIZATION_LOG_DIR = join(homedir(), '.cx', 'optimization-logs');
-const REVIEWS_DIR = join(homedir(), '.cx', 'performance-reviews');
+const OPTIMIZATION_LOG_DIR = join(doctorRoot(), 'optimization-logs');
+const REVIEWS_DIR = join(doctorRoot(), 'performance-reviews');
 
 mkdirSync(OPTIMIZATION_LOG_DIR, { recursive: true });
 

package/lib/hooks/session-start.mjs

@@ -24,6 +24,7 @@ import { listObservations, searchObservations } from '../observation-store.mjs';
 import { countEntities } from '../entity-store.mjs';
 import { logHookFailure } from './_lib/log.mjs';
 import { resolveHookOutputMode, writeHookContext } from './_lib/output-mode.mjs';
+import { doctorRoot } from '../config/xdg.mjs';
 
 const MODULE_DIR = dirname(fileURLToPath(import.meta.url));
 const CONSTRUCT_BIN = resolve(MODULE_DIR, '..', '..', 'bin', 'construct');
@@ -64,11 +65,11 @@ function fileIsFresh(path) {
 // stale context files inject only the digest line as fallback (Tier 2 → Tier 1
 // degradation), full body only when modified within the freshness window.
 const localCtx = join(cwd, '.cx', 'context.md');
-const globalCtx = join(homedir(), '.cx', 'context.md');
+const globalCtx = join(doctorRoot(), '.cx', 'context.md');
 let context = '';
 let contextStale = false;
 const localState = readContextState(cwd);
-const globalState = localState ? null : readContextState(homedir());
+const globalState = localState ? null : readContextState(doctorRoot());
 const stateContext = localState || globalState;
 const stateContextPath = localState ? localCtx : globalCtx;
 if (stateContext?.markdown) {
@@ -151,7 +152,7 @@ try {
 
 // Record memory injection stats for the Stop hook to persist into .cx/memory-stats.jsonl.
 try {
-  const memStatsPath = join(homedir(), '.cx', 'session-memory-stats.json');
+  const memStatsPath = join(doctorRoot(), 'session-memory-stats.json');
   const injected = observationsNote ? (observationsNote.match(/^- /gm) || []).length : 0;
   writeFileSync(memStatsPath, JSON.stringify({
     project: projectName,
@@ -162,7 +163,7 @@ try {
 } catch { /* best effort */ }
 
 // Pending typecheck warning
-const tcPath = join(homedir(), '.cx', 'pending-typecheck.txt');
+const tcPath = join(doctorRoot(), 'pending-typecheck.txt');
 let pendingNote = '';
 try {
   const pending = existsSync(tcPath) ? readFileSync(tcPath, 'utf8').split('\n').filter(Boolean) : [];
@@ -265,28 +266,31 @@ const selfKnowledgeNote = '\nSelf-knowledge: call `knowledge_search` for any Con
 let sourcesNote = '';
 let embedStatusNote = '';
 try {
-  const repos = (process.env.GITHUB_REPOS ?? '').split(',').map(r => r.trim()).filter(Boolean);
-  const jiraConfigured = !!(process.env.JIRA_BASE_URL);
-  const linearConfigured = !!(process.env.LINEAR_API_KEY);
-  const hasSources = repos.length > 0 || jiraConfigured || linearConfigured;
+  const { loadProjectConfig } = await import('../config/project-config.mjs');
+  const { resolveEffectiveSourceTargetsFromConfig } = await import('../config/source-targets.mjs');
+  const { config } = loadProjectConfig(process.cwd(), process.env);
+  const targets = resolveEffectiveSourceTargetsFromConfig(config, process.env);
+  const repos = targets.filter((t) => t.provider === 'github').map((t) => t.selector.repo);
+  const jiraTargets = targets.filter((t) => t.provider === 'jira');
+  const linearTargets = targets.filter((t) => t.provider === 'linear');
+  const slackTargets = targets.filter((t) => t.provider === 'slack');
+  const hasSources = targets.length > 0;
   if (hasSources) {
     const parts = [];
     if (repos.length > 0) parts.push(`GitHub repos: ${repos.join(', ')}`);
-    if (jiraConfigured) parts.push('Jira: configured');
-    if (linearConfigured) parts.push('Linear: configured');
-    // Surface which sources are wired so `provider_fetch` is the obvious
-    // tool for questions about them. The "fetch first, don't answer from
-    // memory" policy lives in the persona.
+    if (jiraTargets.length > 0) parts.push(`Jira projects: ${jiraTargets.map((t) => t.selector.project).join(', ')}`);
+    if (linearTargets.length > 0) parts.push(`Linear teams: ${linearTargets.map((t) => t.selector.team).join(', ')}`);
+    if (slackTargets.length > 0) parts.push(`Slack channels: ${slackTargets.map((t) => t.selector.channel).join(', ')}`);
     sourcesNote = '\nProvider sources wired: ' + parts.join(' · ') +
       '. Use `provider_fetch` for any question about them.\n';
   }
+} catch { /* best effort */ }
 
-  // Embed daemon status — surface as a one-liner so operator always knows state
+try {
   const { resolveEmbedStatus, autoStartEmbedIfNeeded } = await import('../embed/cli.mjs');
   const embedStatus = resolveEmbedStatus(process.env);
   if (embedStatus.level !== 'none') {
     embedStatusNote = `\n## Embed daemon\n${embedStatus.label} · ${embedStatus.detail}\n`;
-    // Auto-start if CX_AUTO_EMBED=1 and daemon is stopped
     if (embedStatus.level === 'stopped' && process.env.CX_AUTO_EMBED === '1') {
       const result = await autoStartEmbedIfNeeded(process.env);
       if (result.started) {
@@ -397,7 +401,7 @@ try {
 try {
   const sessionId = input?.session_id || input?.sessionId;
   if (sessionId) {
-    const bootstrapPath = join(homedir(), ".cx", "bootstrap-state.json");
+    const bootstrapPath = join(doctorRoot(), "bootstrap-state.json");
     let state = {};
     try { state = JSON.parse(readFileSync(bootstrapPath, "utf8")) || {}; } catch {}
     const now = Date.now();

package/lib/hooks/stop-notify.mjs

@@ -27,6 +27,7 @@ import { captureSessionArtifacts } from '../artifact-capture.mjs';
 import { appendSessionStats } from '../memory-stats.mjs';
 import { estimateUsageCost } from '../telemetry/model-pricing-catalog.mjs';
 import { flushReadTrackerDeltas } from '../read-tracker-store.mjs';
+import { doctorRoot } from '../config/xdg.mjs';
 
 function loadTranscriptCheckpoints(checkpointPath) {
   try {
@@ -148,12 +149,12 @@ if (raw) process.stdout.write(raw);
 try { flushReadTrackerDeltas({ env: process.env }); } catch { /* non-critical */ }
 
 const home = homedir();
-const tsResultPath = join(home, '.cx', 'ts-result.txt');
-const warnFlagsPath = join(home, '.cx', 'warn-flags.txt');
-const countPath = join(home, '.cx', 'files-changed-count.txt');
-const costLogPath = join(home, '.cx', 'session-cost.jsonl');
-const lastAgentPath = join(home, '.cx', 'last-agent.json');
-const checkpointPath = join(home, '.cx', 'transcript-checkpoints.json');
+const tsResultPath = join(doctorRoot(home), 'ts-result.txt');
+const warnFlagsPath = join(doctorRoot(home), 'warn-flags.txt');
+const countPath = join(doctorRoot(home), 'files-changed-count.txt');
+const costLogPath = join(doctorRoot(home), 'session-cost.jsonl');
+const lastAgentPath = join(doctorRoot(home), 'last-agent.json');
+const checkpointPath = join(doctorRoot(home), 'transcript-checkpoints.json');
 
 // Consume-clear like warn-flags/files-changed below: a TS result is reported
 // once, not re-fired on every subsequent no-op Stop. stop-typecheck rewrites
@@ -304,7 +305,7 @@ try {
   }
 } catch { /* non-critical */ }
 
-const memStatsPath = join(home, '.cx', 'session-memory-stats.json');
+const memStatsPath = join(doctorRoot(home), 'session-memory-stats.json');
 try {
   if (existsSync(memStatsPath)) {
     const memStats = JSON.parse(readFileSync(memStatsPath, 'utf8'));
@@ -323,7 +324,7 @@ try {
 // repeat Stop events within the window to avoid review-spam.
 try {
   const homeDir = process.env.HOME || homedir();
-  const stampPath = join(homeDir, '.cx', 'performance-reviews', '.last-run');
+  const stampPath = join(doctorRoot(homeDir), 'performance-reviews', '.last-run');
   let lastRun = 0;
   try { lastRun = Number(readFileSync(stampPath, 'utf8')) || 0; } catch { /* fresh */ }
   if (Date.now() - lastRun > 24 * 60 * 60 * 1000) {

package/lib/hooks/stop-typecheck.mjs

@@ -15,6 +15,7 @@ import { readFileSync, writeFileSync, existsSync } from 'fs';
 import { execSync } from 'child_process';
 import { homedir } from 'os';
 import { join, dirname } from 'path';
+import { doctorRoot } from '../config/xdg.mjs';
 
 // Stop hooks must echo stdin to stdout
 let raw = '';
@@ -22,9 +23,9 @@ try { raw = readFileSync(0, 'utf8'); } catch { /* no stdin */ }
 if (raw) process.stdout.write(raw);
 
 const home = homedir();
-const tcPath = join(home, '.cx', 'pending-typecheck.txt');
-const tsResultPath = join(home, '.cx', 'ts-result.txt');
-const warnFlagsPath = join(home, '.cx', 'warn-flags.txt');
+const tcPath = join(doctorRoot(home), 'pending-typecheck.txt');
+const tsResultPath = join(doctorRoot(home), 'ts-result.txt');
+const warnFlagsPath = join(doctorRoot(home), 'warn-flags.txt');
 
 // Read pending files
 const pending = existsSync(tcPath)

package/lib/hooks/test-watch.mjs

@@ -15,10 +15,10 @@
  */
 
 import { readFileSync, existsSync, writeFileSync } from 'node:fs';
-import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { logHookFailure } from './_lib/log.mjs';
 import { emitRoleEvent } from '../roles/hook-emit.mjs';
+import { doctorRoot } from '../config/xdg.mjs';
 
 let input = {};
 try { input = JSON.parse(readFileSync(0, 'utf8')); }
@@ -44,7 +44,7 @@ emitRoleEvent({
   context: { command, exitCode, failedNames },
 });
 
-const flakeTrackerPath = join(homedir(), '.cx', 'test-watch-state.json');
+const flakeTrackerPath = join(doctorRoot(), 'test-watch-state.json');
 try {
   const state = existsSync(flakeTrackerPath) ? JSON.parse(readFileSync(flakeTrackerPath, 'utf8')) : {};
   const now = Date.now();

package/lib/host-disposition.mjs

@@ -2,7 +2,7 @@
  * lib/host-disposition.mjs — single source of truth for the disposition of
  * every artifact Construct creates in a host project (ADR-0027 §1).
  *
- * Scope model (see docs/concepts/project-scopes.md):
+ * Scope model (see docs/guides/concepts/project-scopes.md):
  *   templates/, docs/  — package/repo durable sources (committed)
  *   .construct/        — per-project launcher (ignored)
  *   .cx/               — per-project runtime: intake, oracle, observations, demos (ignored)

package/lib/ingest/provider-extract.mjs

@@ -24,6 +24,7 @@
 import { readFileSync, existsSync } from 'node:fs';
 import { extname, join } from 'node:path';
 import { homedir } from 'node:os';
+import { configDir } from '../config/xdg.mjs';
 
 import {
   AUDIO_VIDEO_EXTS,
@@ -75,7 +76,7 @@ function isAnthropic(provider, model) {
 function resolveKey(varName, env, allowAmbient) {
   if (env[varName] && typeof env[varName] === 'string' && env[varName].length > 0) return env[varName];
   if (!allowAmbient) return null;
-  for (const file of [join(homedir(), '.construct', 'config.env'), join(homedir(), '.env')]) {
+  for (const file of [join(configDir(), 'config.env'), join(homedir(), '.env')]) {
     try {
       if (!existsSync(file)) continue;
       const m = readFileSync(file, 'utf8').match(new RegExp(`^${varName}=["']?(.+?)["']?$`, 'm'));

package/lib/init/detect-existing-structure.mjs

@@ -12,13 +12,13 @@
  *
  * Heuristics intentionally err on the side of "skip" — a directory is treated
  * as a real lane only when it carries at least one markdown file. An empty
- * docs/meetings/ that an earlier init scaffolded does NOT register; that lets
+ * docs/notes/meetings/ that an earlier init scaffolded does NOT register; that lets
  * re-running init be a no-op rather than a contradictory "skip what we just
  * created" message.
  *
  * Issue #97 motivates this: `construct init` on an existing project with
  * `internal/meetings/`, a custom `ingest` script, and root-level `templates/`
- * created `docs/meetings/`, `.cx/inbox/`, and per-lane `templates/` folders
+ * created `docs/notes/meetings/`, `inbox/`, and per-lane `templates/` folders
  * that conflicted with the existing workflow.
  */
 

package/lib/init/doc-lanes.mjs

@@ -32,12 +32,6 @@ export const DOC_LANES = {
     description: 'User-facing release notes and version history entries.',
     templates: ['changelog-entry.md'],
   },
-  intake: {
-    title: 'Intake',
-    dir: 'intake',
-    description: 'Intake batch records that explain what arrived, why it matters, and how it should be ingested.',
-    templates: ['__intake-template__'],
-  },
   memos: {
     title: 'Memos',
     dir: 'memos',
@@ -88,11 +82,11 @@ export const DOC_LANES = {
   },
 };
 
-export const LANE_ORDER = ['adrs', 'briefs', 'changelogs', 'intake', 'memos', 'meetings', 'notes', 'onboarding', 'postmortems', 'prds', 'rfcs', 'runbooks'];
+export const LANE_ORDER = ['adrs', 'briefs', 'changelogs', 'memos', 'meetings', 'notes', 'onboarding', 'postmortems', 'prds', 'rfcs', 'runbooks'];
 
 export const DOC_PRESETS = {
-  lean: ['adrs', 'intake', 'memos', 'meetings', 'notes', 'prds'],
-  product: ['adrs', 'intake', 'memos', 'meetings', 'notes', 'prds', 'rfcs'],
+  lean: ['adrs', 'memos', 'meetings', 'notes', 'prds'],
+  product: ['adrs', 'memos', 'meetings', 'notes', 'prds', 'rfcs'],
   full: LANE_ORDER,
 };
 
@@ -107,7 +101,6 @@ export const LANE_ALIASES = {
   changelogs: 'changelogs',
   releases: 'changelogs',
   release: 'changelogs',
-  intake: 'intake',
   memo: 'memos',
   memos: 'memos',
   meeting: 'meetings',

package/lib/init-docs.mjs

@@ -3,8 +3,8 @@
  * lib/init-docs.mjs — stand up a documentation system for a project.
  *
  * Intentionally separate from `construct init`. Creates the docs surface only:
- * docs/README.md plus selected lane directories such as docs/adr/, docs/intake/,
- * docs/memos/, docs/notes/, docs/prds/, and docs/rfcs/ with starter templates
+ * docs/README.md plus selected lane directories such as docs/decisions/adr/, docs/intake/,
+ * docs/notes/memos/, docs/notes/, templates/docs/prds/, and templates/docs/rfcs/ with starter templates
  * copied into per-lane templates/ directories from Construct's template library.
  *
  * Usage:
@@ -290,15 +290,6 @@ function buildLaneReadme(laneKey) {
     const filename = index === 0 ? "_template.md" : templateName.replace(/\.md$/, ".template.md");
     return `- [${filename}](./templates/${filename})`;
   });
-  const usageSection = laneKey === "intake"
-    ? `
-## Intake flow
-
-- Drop source files into either [\`.cx/inbox/\`](../../.cx/inbox/) or this lane's directory when you want Construct to ingest them.
-- Run \`construct ingest ./docs/intake --sync\` or \`construct ingest ./.cx/inbox --sync\` to convert supported files into retrieval-ready markdown, or let the embed daemon watch those drop zones automatically.
-- Durable ingested knowledge lands under \`.cx/knowledge/internal/\` by default, which is where Construct's learning and search paths already operate.
-`
-    : "";
 
   return `<!--
 docs/${dirName}/README.md — lane guide for ${title}.
@@ -314,7 +305,6 @@ ${description}
 ## Starter templates
 
 ${templateLines.join("\n")}
-${usageSection}
 `;
 }
 
@@ -432,39 +422,6 @@ Promote durable decisions into ADRs, memos, or PRDs when needed.
 `;
 }
 
-function buildIntakeTemplate() {
-  return `<!--
-docs/intake/templates/_template.md — starter template for logging an intake batch.
-
-Use this when you want a durable record of what was dropped into intake and why.
-Raw source files belong in .cx/inbox/ until they are ingested.
--->
-
-# Intake Batch: {title}
-
-- **Date**: {YYYY-MM-DD}
-- **Owner**: {name}
-- **Source**: {vendor, teammate, export, upload}
-
-## What arrived
-
-<!-- Files, folders, or links dropped into .cx/inbox/. -->
-
-## Why it matters
-
-<!-- Why Construct should ingest this material. -->
-
-## Ingest plan
-
-- Run: \`construct ingest ./.cx/inbox --sync\`
-- Target: \`.cx/knowledge/internal/\` unless a different knowledge target is more appropriate
-
-## Notes
-
-<!-- Caveats, access concerns, or cleanup notes. -->
-`;
-}
-
 function titleCase(value) {
   return value
     .split(/[-_\s]+/)
@@ -532,7 +489,6 @@ function copyLaneTemplates(laneKey) {
     const content =
       templateName === "__notes-template__" ? buildNotesTemplate()
       : templateName === '__meeting-notes-template__' ? buildMeetingNotesTemplate()
-      : templateName === "__intake-template__" ? buildIntakeTemplate()
       : fs.readFileSync(path.join(TEMPLATE_DIR, templateName), "utf8");
     writeIfMissing(path.join(laneRoot, "templates", outputName), content);
   }
@@ -632,14 +588,16 @@ async function main() {
   if (withArchitecture) {
     writeIfMissing(path.join(docsDir, "architecture.md"), buildArchitectureDoc(projectName, allScaffoldedLaneKeys));
   }
-  if (lanesToScaffold.includes('intake')) {
-    const inboxDecision = shouldSkipProjectInbox(detection, { force: forceScaffold });
-    if (inboxDecision.skip) {
-      process.stdout.write(`[init:docs] skipping .cx/inbox/ — ${inboxDecision.reason}. Run with --force to scaffold anyway.\n`);
-      skipped.push('.cx/inbox/ (deferred to existing intake)');
-    } else {
-      fs.mkdirSync(path.join(target, '.cx', 'inbox'), { recursive: true });
-    }
+  const inboxDecision = shouldSkipProjectInbox(detection, { force: forceScaffold });
+  if (inboxDecision.skip) {
+    process.stdout.write(`[init:docs] skipping inbox/ — ${inboxDecision.reason}. Run with --force to scaffold anyway.\n`);
+    skipped.push('inbox/ (deferred to existing intake)');
+  } else {
+    // Single canonical drop zone (ADR-0045 §C): the project-root inbox/, with
+    // a gitignored .staging/ for atomic rename-in handoff. Independent of any
+    // docs lane.
+
+    fs.mkdirSync(path.join(target, 'inbox', '.staging'), { recursive: true });
   }
 
   for (const { laneKey, reason } of deferredLanes) {

package/lib/init-unified.mjs

@@ -175,10 +175,7 @@ function detectProjectType(targetPath) {
 function suggestLanes(targetPath, projectType) {
   const suggestions = [];
   const files = fs.readdirSync(targetPath);
-  
-  // Always suggest intake for collecting feedback
-  suggestions.push({ lane: 'intake', reason: 'Collect incoming requests and feedback', recommended: true });
-  
+
   // ADRs for any non-trivial project
   if (projectType.type !== 'docs') {
     suggestions.push({ lane: 'adrs', reason: 'Track architectural decisions', recommended: true });
@@ -365,33 +362,6 @@ Attendees: {{attendees}}
 - [ ] @owner: Task description (due: {{date}})`;
 }
 
-function buildIntakeTemplate() {
-  return `# Intake: {{source}}
-
-Received: {{date}}
-From: {{from}}
-Priority: {{priority}}
-
-## What arrived
-
-Brief description of what was received.
-
-## Why it matters
-
-Why this intake item is important to process.
-
-## How it should be ingested
-
-Processing instructions:
-- [ ] Step 1
-- [ ] Step 2
-- [ ] Step 3
-
-## Notes
-
-<!-- Caveats, access concerns, or cleanup notes. -->`;
-}
-
 function writeIfMissing(filePath, content) {
   if (fs.existsSync(filePath)) {
     skipped.push(path.relative(target, filePath));
@@ -418,8 +388,6 @@ function copyLaneTemplates(laneKey) {
       content = buildNotesTemplate();
     } else if (templateName === '__meeting-notes-template__') {
       content = buildMeetingNotesTemplate();
-    } else if (templateName === "__intake-template__") {
-      content = buildIntakeTemplate();
     } else {
       const templatePath = path.join(TEMPLATE_DIR, templateName);
       if (fs.existsSync(templatePath)) {
@@ -543,8 +511,8 @@ function discoverProjectDirs(targetPath) {
 // Extra inbox-style directories the user can opt into. These are NOT
 // source-code, doc, or test directories: they're places where unsorted
 // signals tend to land (downloads, scratch notes, exported research). The
-// built-in `.cx/inbox/` and `docs/intake/` are always watched and not
-// listed here.
+// canonical `inbox/` at the project root is always watched and not listed
+// here.
 //
 // Historically this list included `src/`, `docs/`, `tests/`, etc., and
 // `init --yes` auto-enabled every one that existed in the project. That
@@ -555,10 +523,9 @@ function discoverProjectDirs(targetPath) {
 const INTAKE_DIR_PRESETS = [];
 
 async function askIntakeCollection(targetPath, skipInteractive) {
-  // Non-interactive default: empty parentDirs. The built-in zones
-  // (.cx/inbox/ and docs/intake/ when present) handle every well-defined
-  // signal path. Users who want to watch additional directories opt in
-  // explicitly via `construct intake config set --add-dir=<path>`.
+  // Non-interactive default: empty parentDirs. The canonical `inbox/` zone
+  // handles every well-defined signal path. Users who want to watch additional
+  // directories opt in explicitly via `construct intake config set --add-dir=<path>`.
   if (skipInteractive) {
     return null;
   }
@@ -583,7 +550,7 @@ async function askIntakeCollection(targetPath, skipInteractive) {
   console.log('  INTAKE COLLECTION');
   console.log('═══════════════════════════════════════════════════════════');
   console.log('');
-  console.log('Intake watches `.cx/inbox/` and `docs/intake/` by default.');
+  console.log('Intake watches `inbox/` at the project root.');
   console.log('Add extra directories ONLY if signals (customer notes, exports,');
   console.log('PDFs, etc.) regularly land there. Do not select code or finished');
   console.log('artifact directories like src/, docs/, or tests/.');
@@ -599,7 +566,7 @@ async function askIntakeCollection(targetPath, skipInteractive) {
   if (selected.length === 0) {
     console.log('');
     console.log('No extra directories selected. The inbox watcher will scan');
-    console.log('.cx/inbox/ and docs/intake/ only. Add more later with:');
+    console.log('`inbox/` only. Add more later with:');
     console.log('  construct intake config set --add-dir=<path>');
     console.log('');
     return null;
@@ -866,41 +833,36 @@ async function main() {
 
 
   // Detect existing project content once; the result feeds three decisions
-  // below: skip .cx/inbox/ on custom intake, skip lane scaffolding for lanes
-  // already covered elsewhere, and skip per-lane templates/ when root
-  // templates/ already has them. --force bypasses every check.
+  // below: skip the inbox/ drop zone on custom intake, skip lane scaffolding
+  // for lanes already covered elsewhere, and skip per-lane templates/ when
+  // root templates/ already has them. --force bypasses every check.
 
   const { detectExistingContent, shouldSkipProjectInbox, shouldScaffoldLane, formatDeferralSummary } =
     await import('./init/detect-existing-structure.mjs');
   const detection = detectExistingContent(target);
   const inboxDecision = shouldSkipProjectInbox(detection, { force: forceScaffold });
 
-  if (inboxDecision.skip) {
-    console.log(`[init:intake] skipping .cx/inbox/ — ${inboxDecision.reason}. Run with --force to scaffold anyway.`);
-    skipped.push('.cx/inbox/ (deferred to existing intake)');
-  } else {
-    // `.cx/inbox/` is the local intake drop zone the watcher polls; under the gitignored
-    // `.cx/` tree the directory must exist on disk but needs no keep file.
-
-    fs.mkdirSync(path.join(target, ".cx", "inbox"), { recursive: true });
-    created.push(".cx/inbox/");
-  }
-
-  // Intake-archetype scaffolding. When the active profile declares
-  // capabilities.intake.inbox, scaffold a project-root inbox/ drop zone and seed
-  // the dedup manifest. The whole inbox/ is ignored via host-disposition
-  // IGNORED_PATTERNS (ADR-0027 §1), so raw drops never enter source and no local
-  // keep-file is needed. Existing-structure detection already opted out of
-  // clobbering a user's pipeline above.
-
-  if (intakeCap?.inbox && !inboxDecision.skip) {
-    const projectInbox = path.join(target, 'inbox');
-    if (!fs.existsSync(projectInbox)) {
-      fs.mkdirSync(projectInbox, { recursive: true });
+  // Single canonical drop zone (ADR-0045 §C): the visible project-root `inbox/`.
+  // Raw drops stay out of source via host-disposition IGNORED_PATTERNS
+  // (ADR-0027 §1). Machine/runtime intake state lives under the gitignored
+  // `.cx/intake/` tree, created lazily by the queue on first use — init no
+  // longer scaffolds the deprecated `.cx/inbox/` drop zone. Skipped when a
+  // custom intake pipeline already owns the project root.
+
+  if (!inboxDecision.skip) {
+    const rootInbox = path.join(target, 'inbox');
+    if (!fs.existsSync(rootInbox)) {
+      fs.mkdirSync(rootInbox, { recursive: true });
       created.push('inbox/');
     }
 
-    if (intakeCap.dedup === 'sha256') {
+    // Writers assemble files under `inbox/.staging/` and atomically rename them
+    // into `inbox/`; the gitignored staging dir keeps a half-written drop
+    // invisible to the watcher until it lands.
+
+    fs.mkdirSync(path.join(rootInbox, '.staging'), { recursive: true });
+
+    if (intakeCap?.dedup === 'sha256') {
       const { saveManifest, loadManifest, MANIFEST_REL_PATH } = await import('./intake/manifest.mjs');
       const manifestExists = fs.existsSync(path.join(target, MANIFEST_REL_PATH));
       if (!manifestExists) {
@@ -908,6 +870,9 @@ async function main() {
         created.push(MANIFEST_REL_PATH);
       }
     }
+  } else {
+    console.log(`[init:intake] skipping inbox/ — ${inboxDecision.reason}. Run with --force to scaffold anyway.`);
+    skipped.push('inbox/ (deferred to existing intake)');
   }
 
   // Gitignore every Construct-generated artifact whose disposition is `ignored`
@@ -1074,32 +1039,22 @@ async function main() {
     console.warn(`⚠️  Could not inject agent-instruction block: ${err.message}`);
   }
 
-  // Intake collection — always write intake-config.json with safe defaults
-  // so the user can inspect what's watched and edit the file directly. Empty
-  // parentDirs is the correct default: the inbox watcher always scans
-  // .cx/inbox/ and docs/intake/ (when present); extra dirs are opt-in.
+  // Intake policy — write the single-zone model (ADR-0045 §C) so the user can
+  // inspect what's watched and edit it directly. The canonical `inbox/` at the
+  // project root is the only drop zone; empty parentDirs is correct — extra
+  // dirs are opt-in.
 
   const intakeConfig = (await askIntakeCollection(target, skipInteractive)) ?? { parentDirs: [], maxDepth: 4 };
-  // When a custom intake surface was detected, default includeProjectInbox
-  // to false so the watcher does not double-claim with the user's existing
-  // pipeline. User can opt in later via `construct config intake.includeProjectInbox=true`.
-
-  if (inboxDecision.skip) intakeConfig.includeProjectInbox = false;
 
-  // Archetype: flip includeArchetypeInbox on so resolveInboxDirs picks up
-  // the project-root inbox/ drop zone alongside .cx/inbox/. Mirrors the
-  // existing includeProjectInbox / includeDocsIntake toggles rather than
-  // polluting parentDirs (which is reserved for user-explicit dirs).
-
-  if (intakeCap?.inbox) {
-    intakeConfig.includeArchetypeInbox = true;
-  }
-  const { saveIntakeConfig } = await import('./intake/intake-config.mjs');
+  const { saveIntakePolicy } = await import('./config/intake-policy.mjs');
   try {
-    saveIntakeConfig(target, intakeConfig);
-    created.push('.cx/intake-config.json');
+    saveIntakePolicy(target, {
+      maxDepth: intakeConfig.maxDepth,
+      additionalDirs: intakeConfig.parentDirs ?? [],
+    });
+    created.push('construct.config.json (intakePolicy)');
   } catch (err) {
-    console.warn(`⚠️  Could not write intake config: ${err.message}`);
+    console.warn(`⚠️  Could not write intake policy: ${err.message}`);
   }
   
   // Ask about documentation system
@@ -1114,7 +1069,7 @@ async function main() {
   // Create documentation system if lanes specified
   if (lanes.length > 0) {
     // Filter out lanes that the project already covers elsewhere
-    // (issue #97: don't create docs/meetings/ when internal/meetings/
+    // (issue #97: don't create docs/notes/meetings/ when internal/meetings/
     // has 12 markdown files). --force bypasses the filter.
 
     const deferredLanes = [];
@@ -1209,7 +1164,7 @@ async function main() {
     const seed = await syncFileStateToSql(target, { env: process.env, project: projectName });
     if (seed?.status === 'ok' && (seed.documentsSynced || 0) > 0) {
       console.log(`\n🔍 Indexed existing project material: ${seed.documentsSynced} doc(s), ${seed.embeddingsSynced || 0} embeddings.`);
-      console.log(`   The agent can now compare new intake (.cx/inbox/, docs/intake/) against your existing PRDs, ADRs, and notes.`);
+      console.log(`   The agent can now compare new intake (inbox/) against your existing PRDs, ADRs, and notes.`);
     }
   } catch { /* silent — corpus seeding is best-effort, not a setup blocker */ }
   
@@ -1240,9 +1195,9 @@ async function main() {
     console.log(`${++step}. Edit plan.md`);
     console.log('   Add your current work and tasks');
     console.log('');
-    if (lanes.includes('intake')) {
+    if (created.includes('inbox/')) {
       console.log(`${++step}. Use Intake`);
-      console.log('   Drop files in .cx/inbox/ for processing');
+      console.log('   Drop files in inbox/ for processing');
       console.log('   Run: construct intake');
       console.log('');
     }