fix: allow explicit profile directories

Author: rockyshi1993

changelogs/unreleased.md

@@ -5,6 +5,7 @@
 
 ## 当前未发布实现候选
 
+- **显式 `init --profile` 目录直通**：手动指定的精确 workspace namespace 只校验安全边界、存在性与目录类型，不再要求 `.git`、`package.json` 等自动发现标记；空目录或无标记目录初始化后以物理目录加 canonical Profile 作为稳定绑定证据。单叶别名、自动发现、歧义、reserved、traversal、workspace escape 与 runtime-only 拒绝边界保持不变。
 - **v1.19.3 归档候选 — 确认持久化与正式任务 owner P0 修复**：TaskRecoveryStoreV5 在无 formal task、无 operational lease 时仍以有界、摘要绑定和 TTL 校验的恢复记录保留 actual instruction、work-item、route、plan 与 project lease；状态超限时仅保留 identity-only 且明确撤销 authority，避免假恢复。生命周期 semantic no-op 仍刷新 live projection，确认后的读取/工具事件不再清空 ingress。`memory_cp_confirm` 生成的安全 Markdown artifactPath 投影现与 task owner reader 共用同一任务根、路径防穿越、稳定文件身份和 SHA-256 复核契约。新增 `npm run test:confirmation-persistence` 作为 30 秒内 P0 专项快测。完整说明见 [`changelogs/releases/v1.19.3.md`](./releases/v1.19.3.md)。
 - **v1.19.2 归档候选 — 宿主权限归属与多呈现面文件打开修复**：`PreToolUse/PermissionRequest` 在 lifecycle、输出 builder 与 Codex/Claude/Gemini/Copilot/Grok/Cursor adapter 三层统一为 advisory-only，剥离遗留 `allow/deny/ask/block/continue:false`，DevCodex 继续记录风险与 typed workflow-invalid，但不再形成任何操作权限判断。新增 `HostLinkCapabilityDecisionV2`，把 `hostSurface` 与 `presentationSurface` 分开，为 Codex Desktop、VS Code、Zed、WebStorm、Codex CLI、Claude/unknown 选择经证据绑定的 native action、终端命令或绝对路径 copy fallback；持久化记忆链接继续保留 `LinkCapabilityDecisionV1`。完整说明见 [`changelogs/releases/v1.19.2.md`](./releases/v1.19.2.md)。
 - **正式任务跨根续接与 Skill 精确读取（PI-306～PI-308 / PF-373～PF-375 / GR-096～GR-098）**：TaskIdentity 首次 root digest 仅作 provenance，Admission/Lifecycle/Stop/MCP takeover 共用 portable binding decision；共享决定先验证不可变 V2 identity/digest，损坏身份失败关闭。新根重新取得 live authority，旧 root 热槽和 BudgetCard/owner/lease 不迁移且不删除。宿主 Skill 隐私规则只放行精确 `SKILL.md` 文件，skills 根目录 list/glob/recurse 仍阻断。跨根 admission/Stop/MCP、tampered identity、真实 D 盘 session remap、Codex system Skill 与危险命令分类定向回归均 PASS。

hooks/_runtime/lifecycle-project-target.cjs

@@ -195,12 +195,16 @@ function buildLifecycleProjectTargetUtils({
     return process.platform === 'win32' ? resolved.toLocaleLowerCase('en-US') : resolved
   }
 
-  function readPhysicalMarkerIdentity(projectRoot) {
-    const markerName = (PROJECT_ROOT_MARKERS || []).find(name => fs.existsSync(path.join(projectRoot, name)))
-    if (!markerName) return null
-    const markerPath = path.join(projectRoot, markerName)
+  function readPhysicalMarkerIdentity(projectRoot, runtimeRoot) {
+    let markerName = (PROJECT_ROOT_MARKERS || []).find(name => fs.existsSync(path.join(projectRoot, name)))
+    let markerPath = markerName ? path.join(projectRoot, markerName) : ''
+    if (!markerName) {
+      markerName = 'canonical-profile'
+      markerPath = path.join(runtimeRoot, 'profile')
+    }
     let stat
     try { stat = fs.statSync(markerPath) } catch { return null }
+    if (markerName === 'canonical-profile' && !stat.isDirectory()) return null
     return {
       markerName,
       markerPath: normalizedIdentityPath(markerPath),
@@ -242,7 +246,7 @@ function buildLifecycleProjectTargetUtils({
         runtimeRoot: path.join(physicalRoot, '.devcodex')
       }
     }
-    const physicalMarker = readPhysicalMarkerIdentity(resolved.projectRoot)
+    const physicalMarker = readPhysicalMarkerIdentity(resolved.projectRoot, resolved.runtimeRoot)
     if (!physicalMarker) return null
     const layoutIdentity = currentLayoutIdentity()
     const physicalRoot = path.resolve(resolved.projectRoot)

hooks/_runtime/workspace-layout.cjs

@@ -225,8 +225,21 @@ function hasProjectRootMarker(dir) {
   return PROJECT_ROOT_MARKERS.some(marker => fs.existsSync(path.join(dir, marker)))
 }
 
+function isDirectoryPath(targetPath) {
+  try { return fs.statSync(targetPath).isDirectory() } catch { return false }
+}
+
+function hasProvisionedProjectProfile(workspaceRoot, namespaceValue) {
+  return isDirectoryPath(path.join(namespaceRootPath(workspaceRoot, namespaceValue), 'profile'))
+}
+
+function hasWorkspaceProjectEvidence(workspaceRoot, namespaceValue, projectRoot) {
+  return hasProjectRootMarker(projectRoot) || hasProvisionedProjectProfile(workspaceRoot, namespaceValue)
+}
+
 /** Discover physical projects only; runtime history is a separate concern. */
-function collectActiveWorkspaceProjectNamespaces(workspaceRoot, { maxDepth = 4 } = {}) {
+function collectActiveWorkspaceProjectNamespaces(workspaceRoot, { maxDepth = 4, runtimeMaxDepth = 8 } = {}) {
+  const root = path.resolve(workspaceRoot)
   const namespaces = new Set()
 
   function scanWorkspaceDirs(root, relativeSegments = [], depth = maxDepth) {
@@ -256,7 +269,16 @@ function collectActiveWorkspaceProjectNamespaces(workspaceRoot, { maxDepth = 4 }
     }
   }
 
-  scanWorkspaceDirs(workspaceRoot)
+  scanWorkspaceDirs(root)
+  // A manually provisioned directory may intentionally have no conventional
+  // project marker. Rehydrate only canonical Profile namespaces whose physical
+  // directory still exists; do not broaden automatic discovery to every folder.
+  for (const namespace of collectWorkspaceRuntimeNamespaces(root, { maxDepth: runtimeMaxDepth })) {
+    const physical = resolvePhysicalNamespace(root, namespace)
+    if (physical && hasProvisionedProjectProfile(root, physical.namespace)) {
+      namespaces.add(physical.namespace)
+    }
+  }
   return [...namespaces].sort((left, right) => left.localeCompare(right))
 }
 
@@ -322,14 +344,27 @@ function resolveWorkspaceProjectTarget(workspaceRoot, requestedTarget, options =
   const layout = { enabled: true, workspaceRoot: root }
   const requested = normalizeProjectNamespace(requestedTarget, { layout, allowEmpty: false })
   const physical = resolvePhysicalNamespace(root, requested)
-  if (physical && hasProjectRootMarker(physical.projectRoot)) {
+  const allowExistingDirectory = options.allowExistingDirectory === true
+  if (physical && (
+    allowExistingDirectory ||
+    hasWorkspaceProjectEvidence(root, physical.namespace, physical.projectRoot)
+  )) {
     return {
       namespace: physical.namespace,
       projectRoot: physical.projectRoot,
       runtimeRoot: namespaceRootPath(root, physical.namespace),
       candidates: [physical.namespace]
     }
   }
+  if (allowExistingDirectory) {
+    const requestedPath = path.join(root, ...splitNamespace(requested))
+    if (fs.existsSync(requestedPath)) {
+      const error = new Error(`project target is not a supported workspace directory: ${requested}`)
+      error.code = 'PROFILE_TARGET_DIRECTORY_MISSING'
+      error.candidates = []
+      throw error
+    }
+  }
 
   const candidates = collectActiveWorkspaceProjectNamespaces(root, options)
   const folded = value => String(value || '').toLocaleLowerCase('en-US')
@@ -361,8 +396,8 @@ function resolveWorkspaceProjectTarget(workspaceRoot, requestedTarget, options =
     error.candidates = matches
     throw error
   }
-  if (!hasProjectRootMarker(projectRoot)) {
-    const error = new Error(`project target has no project marker: ${namespace}`)
+  if (!hasWorkspaceProjectEvidence(root, namespace, projectRoot)) {
+    const error = new Error(`project target has no project marker or canonical Profile: ${namespace}`)
     error.code = 'PROFILE_TARGET_NOT_FOUND'
     error.candidates = candidates
     throw error

scripts/lib/cli-workspace-init-command.js

@@ -38,7 +38,9 @@ function buildWorkspaceInitCommand(ctx) {
       try {
         const existingLayout = typeof findLayoutInfo === 'function' ? findLayoutInfo(cwd) : null
         const workspaceRoot = existingLayout?.enabled ? existingLayout.workspaceRoot : cwd
-        profileTarget = resolveWorkspaceProjectTarget(workspaceRoot, parsed.profileTarget)
+        profileTarget = resolveWorkspaceProjectTarget(workspaceRoot, parsed.profileTarget, {
+          allowExistingDirectory: true
+        })
       } catch (error) {
         return initArgumentFailure(
           refresh ? 'update' : 'init',

scripts/lib/test-hooks-runtime-bootstrap-layout.js

@@ -1565,6 +1565,34 @@ function runHooksRuntimeBootstrapLayoutScenarios(context) {
   assert.strictEqual(missingProfileBinding.status, 'profile-missing')
   assert.strictEqual(missingProfileBinding.error.code, 'PROFILE_MISSING')
 
+  const profileBackedRoot = path.join(TEMP_ROOT, 'blank')
+  fs.mkdirSync(profileBackedRoot, { recursive: true })
+  fs.mkdirSync(path.join(TEMP_ROOT, '.devcodex', 'blank', 'profile'), { recursive: true })
+  fs.writeFileSync(
+    path.join(TEMP_ROOT, '.devcodex', 'blank', 'profile', 'config.json'),
+    JSON.stringify({ mode: 'dev', agent: TEST_AGENT })
+  )
+  const profileBackedBinding = resolveHostWorkspaceBinding({
+    cwd: profileBackedRoot,
+    layout: bindingLayout,
+    requireProfile: true,
+    allowUniqueProject: false
+  })
+  assert.strictEqual(profileBackedBinding.status, 'resolved')
+  assert.strictEqual(profileBackedBinding.projectNamespace, 'blank')
+  assert.strictEqual(profileBackedBinding.source, 'bridge-cwd')
+
+  const profileBackedLifecycle = run({
+    hookEventName: 'UserPromptSubmit',
+    session_id: 'profile-backed-empty-session',
+    prompt: '检查 blank 项目'
+  })
+  assert.strictEqual(profileBackedLifecycle.continue, true)
+  const profileBackedState = JSON.parse(fs.readFileSync(getWorkspaceLayoutStateFile(), 'utf8'))
+  assert.strictEqual(profileBackedState.activeProject, 'blank')
+  assert.strictEqual(profileBackedState.stickyProject.physicalMarker.markerName, 'canonical-profile')
+  assert.strictEqual(profileBackedState.stickyProject.physicalMarker.kind, 'directory')
+
   fs.mkdirSync(path.join(TEMP_ROOT, 'apps', 'app-a'), { recursive: true })
   fs.mkdirSync(path.join(TEMP_ROOT, 'services', 'app-a'), { recursive: true })
   fs.writeFileSync(path.join(TEMP_ROOT, 'apps', 'app-a', 'package.json'), '{}')

scripts/test-cli-behavior.js

@@ -21,6 +21,10 @@ const {
 const {
   commitTaskRecoveryState
 } = require('../hooks/_runtime/task-recovery-store-v5.cjs')
+const {
+  collectActiveWorkspaceProjectNamespaces,
+  resolveWorkspaceProjectTarget
+} = require('../hooks/_runtime/workspace-layout.cjs')
 
 const ROOT = path.resolve(__dirname, '..')
 const CLI = path.join(ROOT, 'index.js')
@@ -596,6 +600,10 @@ function testInitBootstrapsWorkspaceProfileAndOneNamedProject() {
   const ambiguous = JSON.parse(runCliFailure(['init', '--profile', 'api', '--json'], ambiguousRoot))
   assert.strictEqual(ambiguous.errorCode, 'PROFILE_TARGET_AMBIGUOUS')
   assert.ok(!fs.existsSync(path.join(ambiguousRoot, '.devcodex')), 'ambiguous project target must not write runtime or Profile files')
+  fs.mkdirSync(path.join(ambiguousRoot, 'api'), { recursive: true })
+  const exact = JSON.parse(runCli(['init', '--profile', 'api', '--json'], ambiguousRoot))
+  assert.strictEqual(exact.payload.projectProfile.namespace, 'api', 'an exact existing directory must win over leaf aliases')
+  assert.deepStrictEqual(fs.readdirSync(path.join(ambiguousRoot, 'api')), [], 'init must not write inside the selected empty directory')
   fs.rmSync(ambiguousRoot, { recursive: true, force: true })
 }
 
@@ -604,6 +612,8 @@ function testExplicitProfileTargetsAndDryRunStayPhysicalAndZeroWrite() {
   writeFile(dryRunRoot, 'docs/package.json', '{ "name": "docs" }\n')
   writeFile(dryRunRoot, 'clients/acme/api/package.json', '{ "name": "deep-api" }\n')
   writeFile(dryRunRoot, 'dist/fake/package.json', '{ "name": "derived-fake" }\n')
+  fs.mkdirSync(path.join(dryRunRoot, 'empty'), { recursive: true })
+  writeFile(dryRunRoot, 'notes/context.txt', 'manual target without a project marker\n')
   const before = walk(dryRunRoot).map(file => path.relative(dryRunRoot, file)).sort()
   const dry = JSON.parse(runCli(['init', '--profile', 'docs', '--dry-run', '--json'], dryRunRoot))
   const after = walk(dryRunRoot).map(file => path.relative(dryRunRoot, file)).sort()
@@ -614,6 +624,18 @@ function testExplicitProfileTargetsAndDryRunStayPhysicalAndZeroWrite() {
     path.resolve(item.dest).startsWith(path.join(dryRunRoot, '.devcodex', 'docs', 'profile') + path.sep)
   ), 'targeted dry-run actions must use the future workspace namespace path')
 
+  const empty = JSON.parse(runCli(['init', '--profile', 'empty', '--json'], dryRunRoot))
+  assert.strictEqual(empty.payload.projectProfile.namespace, 'empty')
+  assert.deepStrictEqual(fs.readdirSync(path.join(dryRunRoot, 'empty')), [], 'empty project directory must remain untouched')
+  assert.ok(fs.existsSync(path.join(dryRunRoot, '.devcodex', 'empty', 'profile', 'README.md')))
+  assert.ok(collectActiveWorkspaceProjectNamespaces(dryRunRoot).includes('empty'), 'canonical Profile must keep an empty physical project discoverable')
+  assert.strictEqual(resolveWorkspaceProjectTarget(dryRunRoot, 'empty').namespace, 'empty')
+
+  const unmarked = JSON.parse(runCli(['init', '--profile', 'notes', '--json'], dryRunRoot))
+  assert.strictEqual(unmarked.payload.projectProfile.namespace, 'notes')
+  assert.strictEqual(fs.readFileSync(path.join(dryRunRoot, 'notes', 'context.txt'), 'utf8'), 'manual target without a project marker\n')
+  assert.ok(!fs.existsSync(path.join(dryRunRoot, 'notes', '.devcodex')), 'unmarked project directory must not receive legacy runtime files')
+
   const deep = JSON.parse(runCli(['init', '--profile', 'clients/acme/api', '--json'], dryRunRoot))
   assert.strictEqual(deep.payload.projectProfile.namespace, 'clients/acme/api')
   assert.ok(fs.existsSync(path.join(dryRunRoot, '.devcodex', 'clients', 'acme', 'api', 'profile', 'README.md')))
@@ -633,8 +655,19 @@ function testExplicitProfileTargetsAndDryRunStayPhysicalAndZeroWrite() {
   assert.strictEqual(derived.errorCode, 'PROFILE_TARGET_NOT_FOUND')
   assert.deepStrictEqual(derived.details.candidates, [])
   assert.ok(!fs.existsSync(path.join(derivedRoot, '.devcodex')))
+  const exactDerived = JSON.parse(runCli(['init', '--profile', 'dist/fake', '--json'], derivedRoot))
+  assert.strictEqual(exactDerived.payload.projectProfile.namespace, 'dist/fake')
+  assert.ok(fs.existsSync(path.join(derivedRoot, '.devcodex', 'dist', 'fake', 'profile', 'README.md')))
+  assert.ok(collectActiveWorkspaceProjectNamespaces(derivedRoot).includes('dist/fake'), 'explicit derived namespace must remain discoverable after provisioning')
   fs.rmSync(derivedRoot, { recursive: true, force: true })
 
+  const nonDirectoryRoot = createTempRoot('devcodex-cli-non-directory-target-')
+  writeFile(nonDirectoryRoot, 'not-a-directory', 'file target\n')
+  const nonDirectory = JSON.parse(runCliFailure(['init', '--profile', 'not-a-directory', '--json'], nonDirectoryRoot))
+  assert.strictEqual(nonDirectory.errorCode, 'PROFILE_TARGET_DIRECTORY_MISSING')
+  assert.ok(!fs.existsSync(path.join(nonDirectoryRoot, '.devcodex')), 'a file target must fail without runtime writes')
+  fs.rmSync(nonDirectoryRoot, { recursive: true, force: true })
+
   const runtimeOnlyRoot = createTempRoot('devcodex-cli-runtime-only-target-')
   writeFile(runtimeOnlyRoot, '.devcodex/history/profile/README.md', '# historical runtime only\n')
   const runtimeOnly = JSON.parse(runCliFailure(['init', '--profile', 'history', '--json'], runtimeOnlyRoot))

scripts/test-migrate-layout.js

@@ -68,8 +68,8 @@ function main() {
   assert.ok(fs.existsSync(path.join(TEMP_ROOT, '.devcodex', 'workspace', '.memory', 'SUMMARY.md')))
   assert.ok(!fs.existsSync(path.join(TEMP_ROOT, 'chat', '.devcodex')))
   assert.ok(!fs.existsSync(path.join(TEMP_ROOT, 'admin', '.devcodex')))
-  assert.strictEqual(inferProjectFromCwd(path.join(TEMP_ROOT, 'chat')), '')
-  assert.strictEqual(resolveActiveRuntimeRoot(path.join(TEMP_ROOT, 'chat')), path.join(TEMP_ROOT, '.devcodex', 'workspace'))
+  assert.strictEqual(inferProjectFromCwd(path.join(TEMP_ROOT, 'chat')), 'chat')
+  assert.strictEqual(resolveActiveRuntimeRoot(path.join(TEMP_ROOT, 'chat')), path.join(TEMP_ROOT, '.devcodex', 'chat'))
   assert.strictEqual(resolveActiveRuntimeRoot(TEMP_ROOT), path.join(TEMP_ROOT, '.devcodex', 'workspace'))
   assert.strictEqual(resolveGitignoreRoot(path.join(TEMP_ROOT, 'chat')), TEMP_ROOT)