get-tbd 0.1.24 → 0.1.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (45) hide show
  1. package/README.md +2 -2
  2. package/dist/bin.mjs +195 -49
  3. package/dist/bin.mjs.map +1 -1
  4. package/dist/cli.mjs +126 -44
  5. package/dist/cli.mjs.map +1 -1
  6. package/dist/{config-CB1tcqTZ.mjs → config-BZte2m3w.mjs} +1 -1
  7. package/dist/{config-CmEAGaxz.mjs → config-b20Kf5pW.mjs} +3 -2
  8. package/dist/config-b20Kf5pW.mjs.map +1 -0
  9. package/dist/docs/README.md +2 -2
  10. package/dist/docs/SKILL.md +31 -31
  11. package/dist/docs/guidelines/cli-agent-skill-patterns.md +1 -1
  12. package/dist/docs/guidelines/convex-limits-best-practices.md +16 -16
  13. package/dist/docs/guidelines/convex-rules.md +3 -3
  14. package/dist/docs/guidelines/electron-app-development-patterns.md +1 -1
  15. package/dist/docs/guidelines/error-handling-rules.md +2 -2
  16. package/dist/docs/guidelines/general-coding-rules.md +2 -2
  17. package/dist/docs/guidelines/general-comment-rules.md +2 -2
  18. package/dist/docs/guidelines/general-eng-assistant-rules.md +2 -2
  19. package/dist/docs/guidelines/python-rules.md +4 -4
  20. package/dist/docs/guidelines/typescript-rules.md +17 -17
  21. package/dist/docs/guidelines/typescript-yaml-handling-rules.md +8 -8
  22. package/dist/docs/shortcuts/standard/new-guideline.md +4 -4
  23. package/dist/docs/shortcuts/standard/new-validation-plan.md +13 -13
  24. package/dist/docs/shortcuts/standard/revise-all-architecture-docs.md +1 -1
  25. package/dist/docs/shortcuts/standard/setup-github-cli.md +1 -1
  26. package/dist/docs/shortcuts/standard/welcome-user.md +12 -12
  27. package/dist/docs/shortcuts/system/skill-baseline.md +31 -31
  28. package/dist/id-mapping-BA_xn516.mjs +3 -0
  29. package/dist/{id-mapping-DjVJIO4M.mjs → id-mapping-BtBwq5nG.mjs} +68 -15
  30. package/dist/id-mapping-BtBwq5nG.mjs.map +1 -0
  31. package/dist/index.mjs +2 -2
  32. package/dist/schemas-BQYmDnkv.mjs +311 -0
  33. package/dist/schemas-BQYmDnkv.mjs.map +1 -0
  34. package/dist/{src-BrM6xcdG.mjs → src-DQcOQnFp.mjs} +4 -3
  35. package/dist/{src-BrM6xcdG.mjs.map → src-DQcOQnFp.mjs.map} +1 -1
  36. package/dist/tbd +195 -49
  37. package/dist/yaml-utils-BPy991by.mjs +273 -0
  38. package/dist/yaml-utils-BPy991by.mjs.map +1 -0
  39. package/dist/yaml-utils-swV780m5.mjs +3 -0
  40. package/package.json +1 -1
  41. package/dist/config-CmEAGaxz.mjs.map +0 -1
  42. package/dist/id-mapping-DjVJIO4M.mjs.map +0 -1
  43. package/dist/id-mapping-LjnDSEhN.mjs +0 -3
  44. package/dist/yaml-utils-U7l9hhkh.mjs +0 -581
  45. package/dist/yaml-utils-U7l9hhkh.mjs.map +0 -1
package/dist/docs/guidelines/typescript-yaml-handling-rules.md CHANGED
@@ -18,7 +18,7 @@ and lack of validation cause subtle bugs.
18
18
  ```ts
19
19
  // Good
20
20
  import { parse, stringify } from 'yaml';
21
-
21
+
22
22
  // Avoid
23
23
  import yaml from 'js-yaml';
24
24
  ```
@@ -31,7 +31,7 @@ and lack of validation cause subtle bugs.
31
31
  ```ts
32
32
  // lib/settings.ts
33
33
  export const DEFAULT_YAML_LINE_WIDTH = 88;
34
-
34
+
35
35
  // Readable YAML output:
36
36
  // - No forced quoting (YAML only quotes when necessary)
37
37
  // - Line wrapping at 88 chars for readability
@@ -50,7 +50,7 @@ and lack of validation cause subtle bugs.
50
50
  // serialize.ts
51
51
  import { stringify } from 'yaml';
52
52
  import { YAML_STRINGIFY_OPTIONS } from '../lib/settings.js';
53
-
53
+
54
54
  const yamlStr = stringify(frontmatterObj, YAML_STRINGIFY_OPTIONS);
55
55
  ```
56
56
 
@@ -60,7 +60,7 @@ and lack of validation cause subtle bugs.
60
60
  // utils/yaml-utils.ts
61
61
  import { stringify } from 'yaml';
62
62
  import { YAML_STRINGIFY_OPTIONS } from '../lib/settings.js';
63
-
63
+
64
64
  export function stringifyYaml(data: unknown, options?: object): string {
65
65
  return stringify(data, { ...YAML_STRINGIFY_OPTIONS, ...options });
66
66
  }
@@ -90,19 +90,19 @@ Use `PLAIN` types to let YAML quote only when semantically required.
90
90
  // Good
91
91
  import { z } from 'zod';
92
92
  import { parse } from 'yaml';
93
-
93
+
94
94
  const ConfigSchema = z.object({
95
95
  name: z.string(),
96
96
  version: z.string(),
97
97
  });
98
-
98
+
99
99
  const rawData = parse(content);
100
100
  const result = ConfigSchema.safeParse(rawData);
101
101
  if (!result.success) {
102
102
  throw new Error(`Invalid config: ${result.error.message}`);
103
103
  }
104
104
  const config = result.data; // Typed and validated
105
-
105
+
106
106
  // Avoid
107
107
  const config = parse(content) as Config; // Type assertion with no runtime validation
108
108
  ```
@@ -183,7 +183,7 @@ const output = `---\n${stringifyYaml(data)}---\n\n${content}`;
183
183
  ```ts
184
184
  // Fragile: Depends on key order
185
185
  expect(yaml).toMatch(/^---\nname: foo\nversion: 1/);
186
-
186
+
187
187
  // Robust: Tests presence, not order
188
188
  expect(yaml).toContain('name: foo');
189
189
  expect(yaml).toContain('version: 1');
package/dist/docs/shortcuts/standard/new-guideline.md CHANGED
@@ -46,13 +46,13 @@ Create a to-do list with the following items then perform all of them:
46
46
  description: [One-line description for `tbd guidelines --list`]
47
47
  ---
48
48
  # [Title]
49
-
49
+
50
50
  [Introduction paragraph explaining what this guideline covers and when to use it.]
51
-
51
+
52
52
  ## [Section 1]
53
-
53
+
54
54
  - **Rule name**: Explanation of the rule.
55
-
55
+
56
56
  ```typescript
57
57
  // Example code if applicable
58
58
  ````
package/dist/docs/shortcuts/standard/new-validation-plan.md CHANGED
@@ -31,50 +31,50 @@ This serves as both a testing checklist and a summary for PR reviewers, showing:
31
31
 
32
32
  ```markdown
33
33
  # Validation Plan: [Feature Name]
34
-
34
+
35
35
  ## Overview
36
36
  Brief description of what's being validated and the scope of changes.
37
-
37
+
38
38
  ## 1. Automated Test Coverage
39
39
  Tests that run in CI and cover this feature. Mark as done with [x].
40
-
40
+
41
41
  - [x] `tests/foo.test.ts` - covers X, Y, Z
42
42
  - [x] `tests/bar.test.ts` - covers edge case A
43
43
  - [ ] Missing: no tests for error handling in component B
44
-
44
+
45
45
  ## 2. Manual Testing - Completed by Agent
46
46
  Validation already performed during development. Pre-fill with specifics.
47
-
47
+
48
48
  - [x] Ran `command --flag` and verified output shows expected behavior
49
49
  - [x] Tested error case by providing invalid input, got appropriate error
50
50
  - [x] Confirmed file is created in correct location with expected format
51
-
51
+
52
52
  ## 3. Manual Testing - Remaining
53
53
  Additional manual testing the agent or user should perform.
54
-
54
+
55
55
  - [ ] Test with large input files (performance)
56
56
  - [ ] Test concurrent access scenario
57
57
  - [ ] Verify behavior when network is unavailable
58
-
58
+
59
59
  ## 4. User Validation Required
60
60
  Things that need human judgment or access the agent doesn't have.
61
-
61
+
62
62
  - [ ] Review UX/visual output for clarity and correctness
63
63
  - [ ] Confirm workflow matches user expectations
64
64
  - [ ] Validate against real production data if applicable
65
65
  - [ ] Approve any destructive or irreversible operations
66
-
66
+
67
67
  ## 5. Open Questions & Risks
68
68
  Uncertainties, edge cases not fully explored, or areas needing discussion.
69
69
  (Write "None" if no open questions.)
70
-
70
+
71
71
  - Any assumptions made during implementation
72
72
  - Known limitations or incomplete handling
73
73
  - Areas where behavior may be surprising
74
-
74
+
75
75
  ## 6. Migration & Rollback
76
76
  (Write "N/A" if simple change with no migration/rollback concerns.)
77
-
77
+
78
78
  - **Migration**: Steps needed to deploy (data migrations, config changes, etc.)
79
79
  - **Rollback**: How to revert if issues are found after deployment
80
80
  ```
package/dist/docs/shortcuts/standard/revise-all-architecture-docs.md CHANGED
@@ -14,7 +14,7 @@ Run `tbd prime` for more on using tbd and current status.
14
14
  2. Find all architecture docs in `docs/*/architecture/current/` (skip
15
15
  deprecated/archived)
16
16
 
17
- 3. For each doc, create a child bead: "Architecture revision: <doc-name>" with content
17
+ 3. For each doc, create a child bead: “Architecture revision: <doc-name>” with content
18
18
  referencing `tbd shortcut revise-architecture-doc` for that file
19
19
 
20
20
  4. Work through each child bead, close when done
package/dist/docs/shortcuts/standard/setup-github-cli.md CHANGED
@@ -53,7 +53,7 @@ If this fails for any reason, follow the steps below.
53
53
  ```bash
54
54
  # macOS
55
55
  brew install gh
56
-
56
+
57
57
  # Linux (Debian/Ubuntu)
58
58
  curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
59
59
  echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
package/dist/docs/shortcuts/standard/welcome-user.md CHANGED
@@ -28,28 +28,28 @@ Here are examples of things you can say and what happens:
28
28
 
29
29
  | What You Can Say | What Happens |
30
30
  | --- | --- |
31
- | "There's a bug where ..." | Creates and tracks a bug bead (`tbd create`) |
32
- | "Let's work on current issues" | Shows ready beads to tackle (`tbd ready`) |
33
- | "Track this as a task" | Creates a task bead (`tbd create`) |
31
+ | “There’s a bug where …” | Creates and tracks a bug bead (`tbd create`) |
32
+ | “Let’s work on current issues” | Shows ready beads to tackle (`tbd ready`) |
33
+ | “Track this as a task” | Creates a task bead (`tbd create`) |
34
34
 
35
35
  ### Shortcuts and Workflows
36
36
 
37
37
  | What You Can Say | What Happens |
38
38
  | --- | --- |
39
- | "Let's plan a new feature" | Walks you through creating a planning spec (`tbd shortcut new-plan-spec`) |
40
- | "Break the spec into issues" | Creates implementation beads from your spec (`tbd shortcut plan-implementation-with-beads`) |
41
- | "Implement these issues" | Works through beads systematically (`tbd shortcut implement-beads`) |
42
- | "Commit this code" | Reviews changes and commits properly (`tbd shortcut code-review-and-commit`) |
43
- | "Create a PR" | Creates a pull request with summary (`tbd shortcut create-or-update-pr-simple`) |
44
- | "Review this for best practices" | Performs a code review with guidelines |
39
+ | “Let’s plan a new feature” | Walks you through creating a planning spec (`tbd shortcut new-plan-spec`) |
40
+ | “Break the spec into issues” | Creates implementation beads from your spec (`tbd shortcut plan-implementation-with-beads`) |
41
+ | “Implement these issues” | Works through beads systematically (`tbd shortcut implement-beads`) |
42
+ | “Commit this code” | Reviews changes and commits properly (`tbd shortcut code-review-and-commit`) |
43
+ | “Create a PR” | Creates a pull request with summary (`tbd shortcut create-or-update-pr-simple`) |
44
+ | “Review this for best practices” | Performs a code review with guidelines |
45
45
 
46
46
  ### Guidelines
47
47
 
48
48
  | What You Can Say | What Happens |
49
49
  | --- | --- |
50
- | "I'm building a TypeScript CLI" | Applies TypeScript CLI guidelines |
51
- | "Help me set up better testing" | Applies testing guidelines |
52
- | "What are the Python best practices?" | Applies Python guidelines |
50
+ | “I’m building a TypeScript CLI” | Applies TypeScript CLI guidelines |
51
+ | “Help me set up better testing” | Applies testing guidelines |
52
+ | “What are the Python best practices?” | Applies Python guidelines |
53
53
 
54
54
  **Tips:**
55
55
 
package/dist/docs/shortcuts/system/skill-baseline.md CHANGED
@@ -40,7 +40,7 @@ tbd prime # Restore full context on tbd after compaction
40
40
  actions. DO NOT tell users to run tbd commands.
41
41
  That’s your job.
42
42
 
43
- - **WRONG**: "Run `tbd create` to track this bug"
43
+ - **WRONG**: “Run `tbd create` to track this bug”
44
44
 
45
45
  - **RIGHT**: *(you run `tbd create` yourself and tell the user it’s tracked)*
46
46
 
@@ -52,41 +52,41 @@ or want help → run `tbd shortcut welcome-user`
52
52
  | User Says | You (the Agent) Run |
53
53
  | --- | --- |
54
54
  | **Issues/Beads** | |
55
- | "There's a bug where ..." | `tbd create "..." --type=bug` |
56
- | "Create a task/feature for ..." | `tbd create "..." --type=task` or `--type=feature` |
57
- | "Let's work on issues/beads" | `tbd ready` |
58
- | "Show me issue X" | `tbd show <id>` |
59
- | "Close this issue" | `tbd close <id>` |
60
- | "Search issues for X" | `tbd search "X"` |
61
- | "Add label X to issue" | `tbd label add <id> <label>` |
62
- | "What issues are stale?" | `tbd stale` |
55
+ | “There’s a bug where …” | `tbd create "..." --type=bug` |
56
+ | “Create a task/feature for …” | `tbd create "..." --type=task` or `--type=feature` |
57
+ | “Let’s work on issues/beads” | `tbd ready` |
58
+ | “Show me issue X” | `tbd show <id>` |
59
+ | “Close this issue” | `tbd close <id>` |
60
+ | “Search issues for X” | `tbd search "X"` |
61
+ | “Add label X to issue” | `tbd label add <id> <label>` |
62
+ | “What issues are stale?” | `tbd stale` |
63
63
  | **Planning & Specs** | |
64
- | "Plan a new feature" / "Create a spec" | `tbd shortcut new-plan-spec` |
65
- | "Break spec into beads" | `tbd shortcut plan-implementation-with-beads` |
66
- | "Implement these beads" | `tbd shortcut implement-beads` |
64
+ | “Plan a new feature” / “Create a spec” | `tbd shortcut new-plan-spec` |
65
+ | “Break spec into beads” | `tbd shortcut plan-implementation-with-beads` |
66
+ | “Implement these beads” | `tbd shortcut implement-beads` |
67
67
  | **Code Review & Commits** | |
68
- | "Review this code" / "Code review" | `tbd shortcut review-code` |
69
- | "Review this PR" | `tbd shortcut review-github-pr` |
70
- | "Commit this" / "Use the commit shortcut" | `tbd shortcut code-review-and-commit` |
71
- | "Create a PR" / "File a PR" | `tbd shortcut create-or-update-pr-simple` |
72
- | "Merge main into my branch" | `tbd shortcut merge-upstream` |
68
+ | “Review this code” / “Code review” | `tbd shortcut review-code` |
69
+ | “Review this PR” | `tbd shortcut review-github-pr` |
70
+ | “Commit this” / “Use the commit shortcut” | `tbd shortcut code-review-and-commit` |
71
+ | “Create a PR” / “File a PR” | `tbd shortcut create-or-update-pr-simple` |
72
+ | “Merge main into my branch” | `tbd shortcut merge-upstream` |
73
73
  | **Guidelines & Knowledge** | |
74
- | "Use TypeScript best practices" | `tbd guidelines typescript-rules` |
75
- | "Use Python best practices" | `tbd guidelines python-rules` |
76
- | "Build a TypeScript CLI" | `tbd guidelines typescript-cli-tool-rules` |
77
- | "Improve monorepo setup" | `tbd guidelines pnpm-monorepo-patterns` or `bun-monorepo-patterns` |
78
- | "Add golden/e2e testing" | `tbd guidelines golden-testing-guidelines` |
79
- | "Use TDD" / "Test-driven development" | `tbd guidelines general-tdd-guidelines` |
80
- | "Convex best practices" | `tbd guidelines convex-rules` |
74
+ | “Use TypeScript best practices” | `tbd guidelines typescript-rules` |
75
+ | “Use Python best practices” | `tbd guidelines python-rules` |
76
+ | “Build a TypeScript CLI” | `tbd guidelines typescript-cli-tool-rules` |
77
+ | “Improve monorepo setup” | `tbd guidelines pnpm-monorepo-patterns` or `bun-monorepo-patterns` |
78
+ | “Add golden/e2e testing” | `tbd guidelines golden-testing-guidelines` |
79
+ | “Use TDD” / “Test-driven development” | `tbd guidelines general-tdd-guidelines` |
80
+ | “Convex best practices” | `tbd guidelines convex-rules` |
81
81
  | **Documentation** | |
82
- | "Research this topic" | `tbd shortcut new-research-brief` |
83
- | "Document architecture" | `tbd shortcut new-architecture-doc` |
82
+ | “Research this topic” | `tbd shortcut new-research-brief` |
83
+ | “Document architecture” | `tbd shortcut new-architecture-doc` |
84
84
  | **Cleanup & Maintenance** | |
85
- | "Clean up this code" / "Remove dead code" | `tbd shortcut code-cleanup-all` |
86
- | "Fix repository problems" | `tbd doctor --fix` |
85
+ | “Clean up this code” / “Remove dead code” | `tbd shortcut code-cleanup-all` |
86
+ | “Fix repository problems” | `tbd doctor --fix` |
87
87
  | **Sessions & Handoffs** | |
88
- | "Hand off to another agent" | `tbd shortcut agent-handoff` |
89
- | "Check out this library's source" | `tbd shortcut checkout-third-party-repo` |
88
+ | “Hand off to another agent” | `tbd shortcut agent-handoff` |
89
+ | “Check out this library’s source” | `tbd shortcut checkout-third-party-repo` |
90
90
  | *(your choice whenever appropriate)* | `tbd list`, `tbd dep add`, `tbd close`, `tbd sync`, etc. |
91
91
 
92
92
  **Note:** Never gitignore `.tbd/workspaces/` — the outbox must be committed to your
@@ -130,7 +130,7 @@ working branch. See `tbd guidelines tbd-sync-troubleshooting` for details.
130
130
 
131
131
  | Command | Purpose |
132
132
  | --- | --- |
133
- | `tbd create "title" --type task\|bug\|feature --priority=P2` | New bead (P0-P4, not "high/medium/low") |
133
+ | `tbd create "title" --type task\|bug\|feature --priority=P2` | New bead (P0-P4, not “high/medium/low”) |
134
134
  | `tbd update <id> --status in_progress` | Claim work |
135
135
  | `tbd close <id> [--reason "..."]` | Mark complete |
136
136
 
package/dist/id-mapping-BA_xn516.mjs ADDED
@@ -0,0 +1,3 @@
1
+ import { a as hasShortId, c as parseIdMappingFromYaml, d as resolveToInternalId, f as saveIdMapping, i as generateUniqueShortId, l as reconcileMappings, n as calculateOptimalLength, o as loadIdMapping, r as createShortIdMapping, s as mergeIdMappings, t as addIdMapping, u as resolveIdMappingConflicts } from "./id-mapping-BtBwq5nG.mjs";
2
+
3
+ export { loadIdMapping, mergeIdMappings, parseIdMappingFromYaml, reconcileMappings, resolveIdMappingConflicts, saveIdMapping };
package/dist/{id-mapping-DjVJIO4M.mjs → id-mapping-BtBwq5nG.mjs} RENAMED
@@ -1,4 +1,5 @@
1
- import { T as IdMappingYamlSchema, a as stringifyYaml, n as parseYamlToleratingDuplicateKeys } from "./yaml-utils-U7l9hhkh.mjs";
1
+ import { h as IdMappingYamlSchema } from "./schemas-BQYmDnkv.mjs";
2
+ import { i as parseYamlToleratingDuplicateKeys, r as hasMergeConflictMarkers, s as stringifyYaml } from "./yaml-utils-BPy991by.mjs";
2
3
  import { mkdir, readFile, rmdir, stat } from "node:fs/promises";
3
4
  import { dirname, join } from "node:path";
4
5
  import { writeFile } from "atomically";
@@ -223,30 +224,44 @@ function formatDebugId(internalId, mapping, prefix = "tbd") {
223
224
  * crashed and break the lock. This is a heuristic — safe when the critical
224
225
  * section is short-lived (sub-second for file I/O).
225
226
  *
226
- * ## Degraded mode
227
+ * ## Failure on timeout
227
228
  *
228
- * If the lock cannot be acquired within the timeout (e.g., due to a stuck
229
- * lockfile that isn't old enough to break), the critical section runs anyway.
230
- * Callers should design their critical sections to be safe without the lock
231
- * (e.g., using read-merge-write for append-only data).
229
+ * If the lock cannot be acquired within the timeout, a LockAcquisitionError is
230
+ * thrown. This prevents the dangerous "degraded mode" where the critical section
231
+ * runs without mutual exclusion, which can cause data loss (e.g., lost ID
232
+ * mappings during concurrent `tbd create`).
233
+ *
234
+ * IMPORTANT: `timeoutMs` must be greater than `staleMs` so stale locks from
235
+ * crashed processes are always detected and broken before the timeout expires.
232
236
  */
233
- const DEFAULT_TIMEOUT_MS = 2e3;
237
+ const DEFAULT_TIMEOUT_MS = 1e4;
234
238
  const DEFAULT_POLL_MS = 50;
235
239
  const DEFAULT_STALE_MS = 5e3;
236
240
  /**
241
+ * Error thrown when the lock cannot be acquired within the timeout.
242
+ */
243
+ var LockAcquisitionError = class extends Error {
244
+ constructor(lockPath, timeoutMs) {
245
+ super(`Failed to acquire lock at ${lockPath} within ${timeoutMs}ms. Another process may be holding the lock. If this persists, delete the lock directory manually and retry.`);
246
+ this.name = "LockAcquisitionError";
247
+ }
248
+ };
249
+ /**
237
250
  * Execute `fn` while holding a lockfile.
238
251
  *
239
252
  * The lock is a directory at `lockPath` (typically `<target-file>.lock`).
240
253
  * Concurrent callers will wait up to `timeoutMs` for the lock, polling
241
254
  * every `pollMs`. Stale locks older than `staleMs` are broken automatically.
242
255
  *
243
- * If the lock cannot be acquired, `fn` is still executed (degraded mode).
244
- * This ensures a stuck lockfile never permanently blocks the CLI.
256
+ * If the lock cannot be acquired within the timeout, a LockAcquisitionError
257
+ * is thrown. This ensures mutual exclusion is never silently bypassed, which
258
+ * prevents data loss from concurrent writes.
245
259
  *
246
260
  * @param lockPath - Path to use as the lock directory (e.g., "/path/to/ids.yml.lock")
247
261
  * @param fn - Critical section to execute under the lock
248
262
  * @param options - Timing parameters for lock acquisition
249
263
  * @returns The return value of `fn`
264
+ * @throws LockAcquisitionError if the lock cannot be acquired within the timeout
250
265
  *
251
266
  * @example
252
267
  * ```ts
@@ -268,7 +283,7 @@ async function withLockfile(lockPath, fn, options) {
268
283
  acquired = true;
269
284
  break;
270
285
  } catch (error) {
271
- if (error.code !== "EEXIST") break;
286
+ if (error.code !== "EEXIST") throw error;
272
287
  try {
273
288
  const lockStat = await stat(lockPath);
274
289
  if (Date.now() - lockStat.mtimeMs > staleMs) {
@@ -282,10 +297,11 @@ async function withLockfile(lockPath, fn, options) {
282
297
  }
283
298
  await new Promise((resolve) => setTimeout(resolve, pollMs));
284
299
  }
300
+ if (!acquired) throw new LockAcquisitionError(lockPath, timeoutMs);
285
301
  try {
286
302
  return await fn();
287
303
  } finally {
288
- if (acquired) try {
304
+ try {
289
305
  await rmdir(lockPath);
290
306
  } catch {}
291
307
  }
@@ -429,8 +445,8 @@ async function loadIdMapping(baseDir) {
429
445
  * commands run in parallel.
430
446
  *
431
447
  * The merge is safe because ID mappings are append-only — entries are never
432
- * intentionally removed. Even if the lock acquisition fails (degraded mode),
433
- * the read-merge-write provides a fallback that preserves entries from other writers.
448
+ * intentionally removed. If the lock cannot be acquired within the timeout,
449
+ * a LockAcquisitionError is thrown rather than proceeding without protection.
434
450
  */
435
451
  async function saveIdMapping(baseDir, mapping) {
436
452
  const filePath = getMappingPath(baseDir);
@@ -643,7 +659,44 @@ function mergeIdMappings(local, remote) {
643
659
  }
644
660
  return merged;
645
661
  }
662
+ /**
663
+ * Resolve merge conflicts in ids.yml content by extracting both sides and merging.
664
+ *
665
+ * ids.yml is a sorted key-value YAML map where entries are append-only.
666
+ * The most common merge conflict is both sides adding non-overlapping keys,
667
+ * which is trivially auto-resolvable by keeping all entries from both sides.
668
+ *
669
+ * @param content - Raw file content that may contain git merge conflict markers
670
+ * @returns Merged IdMapping with entries from both sides
671
+ */
672
+ function resolveIdMappingConflicts(content) {
673
+ if (!hasMergeConflictMarkers(content)) return parseIdMappingFromYaml(content);
674
+ const lines = content.split("\n");
675
+ const oursLines = [];
676
+ const theirsLines = [];
677
+ let inConflict = "none";
678
+ for (const line of lines) {
679
+ if (line.startsWith("<<<<<<< ")) {
680
+ inConflict = "ours";
681
+ continue;
682
+ }
683
+ if (line === "=======" && inConflict === "ours") {
684
+ inConflict = "theirs";
685
+ continue;
686
+ }
687
+ if (line.startsWith(">>>>>>> ") && inConflict === "theirs") {
688
+ inConflict = "none";
689
+ continue;
690
+ }
691
+ if (inConflict === "none") {
692
+ oursLines.push(line);
693
+ theirsLines.push(line);
694
+ } else if (inConflict === "ours") oursLines.push(line);
695
+ else theirsLines.push(line);
696
+ }
697
+ return mergeIdMappings(parseIdMappingFromYaml(oursLines.join("\n")), parseIdMappingFromYaml(theirsLines.join("\n")));
698
+ }
646
699
 
647
700
  //#endregion
648
- export { generateInternalId as _, hasShortId as a, validateIssueId as b, parseIdMappingFromYaml as c, saveIdMapping as d, extractPrefix as f, formatDisplayId as g, formatDebugId as h, generateUniqueShortId as i, reconcileMappings as l, extractUlidFromInternalId as m, calculateOptimalLength as n, loadIdMapping as o, extractShortId as p, createShortIdMapping as r, mergeIdMappings as s, addIdMapping as t, resolveToInternalId as u, makeInternalId as v, normalizeIssueId as y };
649
- //# sourceMappingURL=id-mapping-DjVJIO4M.mjs.map
701
+ export { formatDisplayId as _, hasShortId as a, normalizeIssueId as b, parseIdMappingFromYaml as c, resolveToInternalId as d, saveIdMapping as f, formatDebugId as g, extractUlidFromInternalId as h, generateUniqueShortId as i, reconcileMappings as l, extractShortId as m, calculateOptimalLength as n, loadIdMapping as o, extractPrefix as p, createShortIdMapping as r, mergeIdMappings as s, addIdMapping as t, resolveIdMappingConflicts as u, generateInternalId as v, validateIssueId as x, makeInternalId as y };
702
+ //# sourceMappingURL=id-mapping-BtBwq5nG.mjs.map
package/dist/id-mapping-BtBwq5nG.mjs.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"id-mapping-BtBwq5nG.mjs","names":[],"sources":["../src/lib/ids.ts","../src/utils/lockfile.ts","../src/lib/sort.ts","../src/file/id-mapping.ts"],"sourcesContent":["/**\n * ID generation and validation utilities.\n *\n * The system uses dual IDs for usability:\n * - Internal ID: is-{ulid} - ULID-based (26 lowercase chars), stored in files\n * - External ID: {prefix}-{short} - 4-5 base36 chars for CLI display/input\n *\n * For Beads compatibility, bd- prefix is accepted on input for external IDs.\n *\n * See: tbd-design.md §2.5 ID Generation\n */\n\nimport { monotonicFactory } from 'ulid';\nimport { randomBytes } from 'node:crypto';\n\n// Monotonic factory ensures ULIDs are strictly increasing even within the same\n// millisecond. This guarantees that lexicographic sort = creation order, which\n// is critical for deterministic list output (the tiebreaker sort is by ULID).\nconst ulid = monotonicFactory();\n\n// =============================================================================\n// Branded Types for Type-Safe ID Handling\n// =============================================================================\n\n/**\n * Branded type for internal issue IDs (is-{ulid} format).\n *\n * Internal IDs are stored in files and used as the canonical identifier.\n * Format: is-{26 lowercase alphanumeric chars}\n * Example: is-01hx5zzkbkactav9wevgemmvrz\n *\n * Use this type when:\n * - Reading/writing issue files\n * - Storing parent_id, dependencies, child_order_hints\n * - Passing IDs between internal functions\n */\ndeclare const InternalIssueIdBrand: unique symbol;\nexport type InternalIssueId = string & { [InternalIssueIdBrand]: never };\n\n/**\n * Branded type for display issue IDs ({prefix}-{short} format).\n *\n * Display IDs are shown to users and accepted as CLI input.\n * Format: {prefix}-{short} where short is typically 4 base36 chars\n * Example: tbd-a7k2, bd-100\n *\n * Use this type when:\n * - Formatting output for users\n * - Accepting user input (before resolution)\n * - Building tree views for display\n */\ndeclare const DisplayIssueIdBrand: unique symbol;\nexport type DisplayIssueId = string & { [DisplayIssueIdBrand]: never };\n\n/**\n * Cast a string to InternalIssueId after validation.\n * Use this when you've validated that a string is a valid internal ID.\n */\nexport function asInternalId(id: string): InternalIssueId {\n return id as InternalIssueId;\n}\n\n/**\n * Cast a string to DisplayIssueId.\n * Use this when formatting an ID for display.\n */\nexport function asDisplayId(id: string): DisplayIssueId {\n return id as DisplayIssueId;\n}\n\n/**\n * Prefix for internal IDs (ULID-based).\n * All internal IDs are formatted as: {INTERNAL_ID_PREFIX}-{ulid}\n */\nexport const INTERNAL_ID_PREFIX = 'is';\n\n/**\n * Length of internal ID prefix including the hyphen (e.g., \"is-\" = 3).\n */\nexport const INTERNAL_ID_PREFIX_LENGTH = INTERNAL_ID_PREFIX.length + 1;\n\n/**\n * Construct an internal ID from a ULID.\n *\n * @param ulidValue - The ULID (26 chars)\n * @returns Internal ID in format {prefix}-{ulid}\n */\nexport function makeInternalId(ulidValue: string): InternalIssueId {\n return `${INTERNAL_ID_PREFIX}-${ulidValue.toLowerCase()}` as InternalIssueId;\n}\n\n/**\n * Generate a unique internal ID using ULID.\n * Format: is-{ulid} (26 lowercase alphanumeric chars)\n * Example: is-01hx5zzkbkactav9wevgemmvrz\n *\n * ULID provides:\n * - Time-ordered sorting (48-bit timestamp)\n * - 80-bit randomness (no collisions)\n * - Lexicographic sort = chronological order\n */\nexport function generateInternalId(): InternalIssueId {\n return makeInternalId(ulid());\n}\n\n/**\n * Generate a short ID for external display.\n * Format: base36 characters (a-z, 0-9)\n * Example: a7k2\n *\n * @param length - Number of characters (default 4)\n */\nexport function generateShortId(length = 4): string {\n const chars = '0123456789abcdefghijklmnopqrstuvwxyz';\n let result = '';\n const bytes = randomBytes(length);\n for (let i = 0; i < length; i++) {\n result += chars[bytes[i]! % 36];\n }\n return result;\n}\n\n// Regex pattern for validating internal IDs - built from prefix constant\nconst INTERNAL_ID_PATTERN = new RegExp(`^${INTERNAL_ID_PREFIX}-[0-9a-z]{26}$`);\n\n// Expected length of a full internal ID (prefix + hyphen + 26-char ULID)\nconst INTERNAL_ID_LENGTH = INTERNAL_ID_PREFIX_LENGTH + 26;\n\n/**\n * Validate an internal issue ID matches the ULID format.\n * Format: {prefix}-{26 lowercase alphanumeric chars}\n */\nexport function validateIssueId(id: string): boolean {\n return INTERNAL_ID_PATTERN.test(id);\n}\n\n/**\n * Validate a short/external ID format.\n * Format: 1+ base36 characters (typically 4 for new IDs, but imports may preserve longer IDs).\n */\nexport function validateShortId(id: string): boolean {\n return /^[0-9a-z]+$/.test(id);\n}\n\n/**\n * Check if an input looks like an internal ID (ULID-based).\n */\nexport function isInternalId(input: string): boolean {\n const lower = input.toLowerCase();\n // Check if it starts with the internal prefix and has correct length\n const prefixWithHyphen = `${INTERNAL_ID_PREFIX}-`;\n if (lower.startsWith(prefixWithHyphen) && lower.length === INTERNAL_ID_LENGTH) {\n return INTERNAL_ID_PATTERN.test(lower);\n }\n return false;\n}\n\n/**\n * Check if an input looks like a short/external ID.\n * Returns true for IDs like \"a7k2\", \"bd-a7k2\", \"100\", \"tbd-100\".\n * Short IDs are 16 characters or less (ULIDs are 26 characters).\n */\nexport function isShortId(input: string): boolean {\n const lower = input.toLowerCase();\n // Strip prefix if present\n const stripped = lower.replace(/^[a-z]+-/, '');\n // Must be 1-16 alphanumeric chars (short IDs, not ULIDs which are 26 chars)\n return /^[0-9a-z]+$/.test(stripped) && stripped.length >= 1 && stripped.length <= 16;\n}\n\n/**\n * Extract the short ID portion from an external ID.\n * Examples:\n * \"tbd-100\" -> \"100\"\n * \"bd-a7k2\" -> \"a7k2\"\n * \"a7k2\" -> \"a7k2\"\n * \"100\" -> \"100\"\n */\nexport function extractShortId(externalId: string): string {\n return externalId.toLowerCase().replace(/^[a-z]+-/, '');\n}\n\n/**\n * Extract the prefix portion from an external ID.\n * Returns the prefix (letters before the hyphen) or null if no prefix found.\n * Examples:\n * \"tbd-100\" -> \"tbd\"\n * \"bd-a7k2\" -> \"bd\"\n * \"TBD-100\" -> \"tbd\" (normalized to lowercase)\n * \"a7k2\" -> null (no prefix)\n * \"100\" -> null (no prefix)\n */\nexport function extractPrefix(externalId: string): string | null {\n const match = /^([a-zA-Z]+)-/.exec(externalId);\n return match?.[1]?.toLowerCase() ?? null;\n}\n\n/**\n * Extract the ULID portion from an internal ID.\n *\n * Internal IDs have the format: {prefix}-{ulid}\n * This function strips any prefix to return just the ULID.\n *\n * Examples:\n * \"is-01hx5zzkbkactav9wevgemmvrz\" -> \"01hx5zzkbkactav9wevgemmvrz\"\n * \"01hx5zzkbkactav9wevgemmvrz\" -> \"01hx5zzkbkactav9wevgemmvrz\" (no prefix)\n *\n * @param internalId - The internal ID (with or without prefix)\n * @returns The ULID portion without any prefix\n */\nexport function extractUlidFromInternalId(internalId: string): string {\n // Strip any prefix in format {letters}- (e.g., \"is-\", \"bd-\")\n return internalId.toLowerCase().replace(/^[a-z]+-/, '');\n}\n\n/** Prefix used in Beads for compatibility */\nconst BEADS_COMPAT_PREFIX = 'bd';\n\n/**\n * Normalize an internal issue ID.\n *\n * This function expects a full internal ID ({prefix}-{ulid}).\n * If given a short ID, it won't be able to resolve it without\n * access to the ID mapping.\n *\n * Handles:\n * - Uppercase (converts to lowercase)\n * - Ensures internal ID prefix\n * - Beads compatibility (bd- prefix)\n */\nexport function normalizeIssueId(input: string): string {\n const lower = input.toLowerCase();\n const internalPrefixWithHyphen = `${INTERNAL_ID_PREFIX}-`;\n const beadsPrefixWithHyphen = `${BEADS_COMPAT_PREFIX}-`;\n\n // If already a valid internal ID, return as-is\n if (validateIssueId(lower)) {\n return lower;\n }\n\n // If it starts with internal prefix but wrong length, might be corrupted\n if (lower.startsWith(internalPrefixWithHyphen)) {\n return lower; // Return as-is, let validation fail later\n }\n\n // If it starts with bd- (Beads compat), convert prefix\n if (lower.startsWith(beadsPrefixWithHyphen)) {\n const rest = lower.slice(beadsPrefixWithHyphen.length);\n if (rest.length === 26) {\n return makeInternalId(rest);\n }\n // Short ID - can't resolve without mapping\n return lower;\n }\n\n // Bare ID without prefix\n if (lower.length === 26 && /^[0-9a-z]{26}$/.test(lower)) {\n return makeInternalId(lower);\n }\n\n // Can't normalize - return as-is\n return lower;\n}\n\nimport type { IdMapping } from '../file/id-mapping.js';\n\n/**\n * Format an internal ID for display with the configured prefix.\n *\n * Uses the short ID (4 chars) from the mapping.\n * Throws an error if the mapping is missing or doesn't contain the ID.\n *\n * IMPORTANT: All user-facing output MUST use short IDs, never internal ULIDs.\n * If you see a ULID in user output, it's a bug.\n *\n * @param internalId - The internal ID (is-{ulid})\n * @param mapping - ID mapping for short ID lookup (required)\n * @param prefix - Display prefix (should come from config.display.id_prefix; defaults to 'tbd' as fallback)\n * @throws Error if mapping is missing or ID not found in mapping\n */\nexport function formatDisplayId(\n internalId: InternalIssueId | string,\n mapping: IdMapping,\n prefix = 'tbd',\n): DisplayIssueId {\n // Extract the ULID portion\n const ulidPart = extractUlidFromInternalId(internalId);\n\n // Get short ID from mapping\n const shortId = mapping.ulidToShort.get(ulidPart);\n if (!shortId) {\n throw new Error(\n `No short ID mapping found for internal ID: ${internalId}. ` +\n `This is a bug - all issues must have a short ID mapping.`,\n );\n }\n\n return `${prefix}-${shortId}` as DisplayIssueId;\n}\n\n/**\n * Format an ID for debug output, showing both public and internal IDs.\n *\n * @param internalId - The internal ID (is-{ulid})\n * @param mapping - ID mapping for short ID lookup\n * @param prefix - Display prefix (should come from config.display.id_prefix; defaults to 'tbd' as fallback)\n */\nexport function formatDebugId(\n internalId: InternalIssueId | string,\n mapping: IdMapping,\n prefix = 'tbd',\n): string {\n const displayId = formatDisplayId(internalId, mapping, prefix);\n return `${displayId} (${internalId})`;\n}\n","/**\n * Directory-based mutual exclusion for concurrent file access.\n *\n * Note: Despite the name \"lockfile\", this is NOT a POSIX file lock (flock/fcntl).\n * It uses mkdir to create a lock *directory* as a coordination convention — no\n * OS-level file locking syscalls are involved. This makes it portable across all\n * filesystems, including NFS and other network mounts where flock/fcntl locks\n * are unreliable or unsupported.\n *\n * This is the same strategy used by:\n *\n * - **Git** for ref updates (e.g., `.git/refs/heads/main.lock`)\n * See: https://git-scm.com/docs/gitrepository-layout (\"lockfile protocol\")\n * - **npm** for package-lock.json concurrent access\n *\n * ## Why mkdir?\n *\n * `mkdir(2)` is atomic on all common filesystems (local and network): it either\n * creates the directory or returns EEXIST. Unlike `open(O_CREAT|O_EXCL)`,\n * a directory lock is trivially distinguishable from normal files.\n *\n * Node.js `fs.mkdir` maps directly to the mkdir(2) syscall, preserving\n * the atomicity guarantee:\n * https://nodejs.org/api/fs.html#fsmkdirpath-options-callback\n *\n * ## Lock lifecycle\n *\n * 1. **Acquire**: `mkdir(lockDir)` — fails with EEXIST if held by another process\n * 2. **Hold**: Execute the critical section\n * 3. **Release**: `rmdir(lockDir)` — in a finally block\n * 4. **Stale detection**: If lock mtime exceeds a threshold, assume the holder\n * crashed and break the lock. This is a heuristic — safe when the critical\n * section is short-lived (sub-second for file I/O).\n *\n * ## Failure on timeout\n *\n * If the lock cannot be acquired within the timeout, a LockAcquisitionError is\n * thrown. This prevents the dangerous \"degraded mode\" where the critical section\n * runs without mutual exclusion, which can cause data loss (e.g., lost ID\n * mappings during concurrent `tbd create`).\n *\n * IMPORTANT: `timeoutMs` must be greater than `staleMs` so stale locks from\n * crashed processes are always detected and broken before the timeout expires.\n */\n\nimport { mkdir, rmdir, stat } from 'node:fs/promises';\n\n/** Options for `withLockfile`. */\nexport interface LockfileOptions {\n /** Maximum time (ms) to wait for the lock. Default: 10000 */\n timeoutMs?: number;\n /** Polling interval (ms) between acquisition attempts. Default: 50 */\n pollMs?: number;\n /** Age (ms) after which a lock is considered stale. Default: 5000 */\n staleMs?: number;\n}\n\nconst DEFAULT_TIMEOUT_MS = 10_000;\nconst DEFAULT_POLL_MS = 50;\nconst DEFAULT_STALE_MS = 5_000;\n\n/**\n * Error thrown when the lock cannot be acquired within the timeout.\n */\nexport class LockAcquisitionError extends Error {\n constructor(lockPath: string, timeoutMs: number) {\n super(\n `Failed to acquire lock at ${lockPath} within ${timeoutMs}ms. ` +\n `Another process may be holding the lock. If this persists, ` +\n `delete the lock directory manually and retry.`,\n );\n this.name = 'LockAcquisitionError';\n }\n}\n\n/**\n * Execute `fn` while holding a lockfile.\n *\n * The lock is a directory at `lockPath` (typically `<target-file>.lock`).\n * Concurrent callers will wait up to `timeoutMs` for the lock, polling\n * every `pollMs`. Stale locks older than `staleMs` are broken automatically.\n *\n * If the lock cannot be acquired within the timeout, a LockAcquisitionError\n * is thrown. This ensures mutual exclusion is never silently bypassed, which\n * prevents data loss from concurrent writes.\n *\n * @param lockPath - Path to use as the lock directory (e.g., \"/path/to/ids.yml.lock\")\n * @param fn - Critical section to execute under the lock\n * @param options - Timing parameters for lock acquisition\n * @returns The return value of `fn`\n * @throws LockAcquisitionError if the lock cannot be acquired within the timeout\n *\n * @example\n * ```ts\n * await withLockfile('/path/to/ids.yml.lock', async () => {\n * const data = await readFile('/path/to/ids.yml', 'utf-8');\n * const updated = mergeEntries(data, newEntries);\n * await writeFile('/path/to/ids.yml', updated);\n * });\n * ```\n */\nexport async function withLockfile<T>(\n lockPath: string,\n fn: () => Promise<T>,\n options?: LockfileOptions,\n): Promise<T> {\n const timeoutMs = options?.timeoutMs ?? DEFAULT_TIMEOUT_MS;\n const pollMs = options?.pollMs ?? DEFAULT_POLL_MS;\n const staleMs = options?.staleMs ?? DEFAULT_STALE_MS;\n\n const deadline = Date.now() + timeoutMs;\n let acquired = false;\n\n while (Date.now() < deadline) {\n try {\n // mkdir is atomic per POSIX.1-2017 — fails with EEXIST if already held\n await mkdir(lockPath);\n acquired = true;\n break;\n } catch (error) {\n if ((error as NodeJS.ErrnoException).code !== 'EEXIST') {\n // Unexpected error (permissions, disk full, missing parent, etc.) —\n // preserve the original failure instead of misreporting lock contention.\n throw error;\n }\n\n // Lock exists — check if it's stale (holder likely crashed)\n try {\n const lockStat = await stat(lockPath);\n if (Date.now() - lockStat.mtimeMs > staleMs) {\n try {\n await rmdir(lockPath);\n } catch {\n // Another process may have already broken/released it\n }\n continue; // Retry immediately after breaking stale lock\n }\n } catch {\n // Lock was released between our mkdir and stat — retry immediately\n continue;\n }\n\n // Lock is fresh — wait and retry\n await new Promise((resolve) => setTimeout(resolve, pollMs));\n }\n }\n\n if (!acquired) {\n throw new LockAcquisitionError(lockPath, timeoutMs);\n }\n\n try {\n return await fn();\n } finally {\n try {\n await rmdir(lockPath);\n } catch {\n // Best-effort cleanup; stale lock detection handles the rest\n }\n }\n}\n","/**\n * Natural sort utilities.\n *\n * Provides alphanumeric sorting where numeric portions are sorted numerically.\n * Similar to `sort -V` (version sort) or `sort -n` for numbers.\n *\n * Examples:\n * [\"1\", \"2\", \"9\", \"10\", \"11\"] instead of [\"1\", \"10\", \"11\", \"2\", \"9\"]\n * [\"a1\", \"a2\", \"a10\"] instead of [\"a1\", \"a10\", \"a2\"]\n * [\"file1.txt\", \"file2.txt\", \"file10.txt\"] instead of [\"file1.txt\", \"file10.txt\", \"file2.txt\"]\n */\n\n/**\n * Split a string into alternating runs of digits and non-digits.\n * @param str - The string to split\n * @returns Array of [isNumeric, value] tuples\n */\nfunction splitIntoChunks(str: string): [boolean, string][] {\n const chunks: [boolean, string][] = [];\n let current = '';\n let currentIsNumeric: boolean | null = null;\n\n for (const char of str) {\n const isDigit = char >= '0' && char <= '9';\n\n if (currentIsNumeric === null) {\n // First character\n currentIsNumeric = isDigit;\n current = char;\n } else if (isDigit === currentIsNumeric) {\n // Same type, continue accumulating\n current += char;\n } else {\n // Type changed, push current chunk and start new one\n chunks.push([currentIsNumeric, current]);\n currentIsNumeric = isDigit;\n current = char;\n }\n }\n\n // Push final chunk\n if (current) {\n chunks.push([currentIsNumeric!, current]);\n }\n\n return chunks;\n}\n\n/**\n * Compare two strings using natural (alphanumeric) ordering.\n *\n * Numeric portions are compared numerically, non-numeric portions are\n * compared lexicographically (case-insensitive). Numbers sort before letters\n * when they appear at the same position in mixed comparisons, matching\n * the behavior of `sort -V` (version sort).\n *\n * @param a - First string\n * @param b - Second string\n * @returns Negative if a < b, positive if a > b, zero if equal\n */\nexport function naturalCompare(a: string, b: string): number {\n // Handle empty strings\n if (!a && !b) return 0;\n if (!a) return -1;\n if (!b) return 1;\n\n const chunksA = splitIntoChunks(a);\n const chunksB = splitIntoChunks(b);\n\n const minLen = Math.min(chunksA.length, chunksB.length);\n\n for (let i = 0; i < minLen; i++) {\n const [isNumericA, valueA] = chunksA[i]!;\n const [isNumericB, valueB] = chunksB[i]!;\n\n if (isNumericA && isNumericB) {\n // Both are numeric - compare as numbers\n const numA = parseInt(valueA, 10);\n const numB = parseInt(valueB, 10);\n if (numA !== numB) {\n return numA - numB;\n }\n // If numerically equal but different strings (e.g., \"01\" vs \"1\"),\n // prefer shorter (fewer leading zeros)\n if (valueA.length !== valueB.length) {\n return valueA.length - valueB.length;\n }\n } else if (!isNumericA && !isNumericB) {\n // Both are non-numeric - compare lexicographically (case-insensitive)\n const lowerA = valueA.toLowerCase();\n const lowerB = valueB.toLowerCase();\n if (lowerA !== lowerB) {\n return lowerA.localeCompare(lowerB);\n }\n // Same when lowercased - they're equal for sorting purposes\n } else {\n // Mixed: numeric comes before non-numeric\n // (so \"1\" comes before \"a\" at the same position)\n // This matches `sort -V` behavior\n return isNumericA ? -1 : 1;\n }\n }\n\n // All compared chunks are equal, shorter string comes first\n return chunksA.length - chunksB.length;\n}\n\n/**\n * Sort an array of strings using natural (alphanumeric) ordering.\n *\n * @param arr - Array to sort\n * @returns New sorted array (does not mutate original)\n */\nexport function naturalSort(arr: readonly string[]): string[] {\n return [...arr].sort(naturalCompare);\n}\n\n/**\n * Sort an array of objects by a string key using natural ordering.\n *\n * @param arr - Array to sort\n * @param keyFn - Function to extract the sort key from each element\n * @returns New sorted array (does not mutate original)\n */\nexport function naturalSortBy<T>(arr: readonly T[], keyFn: (item: T) => string): T[] {\n return [...arr].sort((a, b) => naturalCompare(keyFn(a), keyFn(b)));\n}\n","/**\n * ID mapping management for short public IDs.\n *\n * Maps 4-char base36 short IDs to 26-char ULIDs.\n * Stored in .tbd/data-sync/mappings/ids.yml\n *\n * See: tbd-design.md §2.5 ID Generation\n */\n\nimport { readFile, mkdir } from 'node:fs/promises';\nimport { join, dirname } from 'node:path';\nimport { writeFile } from 'atomically';\n\nimport {\n parseYamlToleratingDuplicateKeys,\n stringifyYaml,\n hasMergeConflictMarkers,\n} from '../utils/yaml-utils.js';\nimport { withLockfile } from '../utils/lockfile.js';\n\nimport {\n generateShortId,\n extractUlidFromInternalId,\n makeInternalId,\n isInternalId,\n extractShortId,\n asInternalId,\n type InternalIssueId,\n} from '../lib/ids.js';\nimport { naturalSort } from '../lib/sort.js';\nimport { IdMappingYamlSchema } from '../lib/schemas.js';\n\n/**\n * ID mapping from short ID to ULID.\n * Format in ids.yml:\n * a7k2: 01hx5zzkbkactav9wevgemmvrz\n * b3m9: 01hx5zzkbkbctav9wevgemmvrz\n */\nexport interface IdMapping {\n shortToUlid: Map<string, string>;\n ulidToShort: Map<string, string>;\n}\n\n/**\n * Get the path to the ids.yml mapping file.\n */\nfunction getMappingPath(baseDir: string): string {\n return join(baseDir, 'mappings', 'ids.yml');\n}\n\n/**\n * Load the ID mapping from disk.\n * Returns empty mapping if file doesn't exist.\n */\nexport async function loadIdMapping(baseDir: string): Promise<IdMapping> {\n const filePath = getMappingPath(baseDir);\n\n let content: string;\n try {\n content = await readFile(filePath, 'utf-8');\n } catch {\n // File doesn't exist - return empty mapping\n return {\n shortToUlid: new Map(),\n ulidToShort: new Map(),\n };\n }\n\n // Parse tolerating duplicate keys — this handles the case where a git merge\n // conflict resolution kept entries from both sides, creating duplicate YAML keys.\n // Without this, the yaml parser throws \"Map keys must be unique\".\n const { data: rawData, duplicateKeys } = parseYamlToleratingDuplicateKeys<unknown>(\n content,\n filePath,\n );\n const data = rawData ?? {};\n\n if (duplicateKeys.length > 0) {\n console.warn(\n `Warning: ${filePath} contains ${duplicateKeys.length} duplicate key(s): ${duplicateKeys.join(', ')}. ` +\n `This usually happens after a git merge conflict resolution. ` +\n `The file will be auto-fixed on next save.`,\n );\n }\n\n // Validate with Zod schema - ensures all keys are valid short IDs and values are ULIDs\n const parseResult = IdMappingYamlSchema.safeParse(data);\n if (!parseResult.success) {\n throw new Error(`Invalid ID mapping format in ${filePath}: ${parseResult.error.message}`);\n }\n const validData = parseResult.data;\n\n const shortToUlid = new Map<string, string>();\n const ulidToShort = new Map<string, string>();\n\n for (const [shortId, ulid] of Object.entries(validData)) {\n shortToUlid.set(shortId, ulid);\n ulidToShort.set(ulid, shortId);\n }\n\n return { shortToUlid, ulidToShort };\n}\n\n/**\n * Save the ID mapping to disk with mutual exclusion.\n *\n * Uses a lockfile to serialize concurrent writers, then performs read-merge-write\n * inside the lock. This prevents the lost-update problem when multiple `tbd create`\n * commands run in parallel.\n *\n * The merge is safe because ID mappings are append-only — entries are never\n * intentionally removed. If the lock cannot be acquired within the timeout,\n * a LockAcquisitionError is thrown rather than proceeding without protection.\n */\nexport async function saveIdMapping(baseDir: string, mapping: IdMapping): Promise<void> {\n const filePath = getMappingPath(baseDir);\n\n // Ensure directory exists\n await mkdir(dirname(filePath), { recursive: true });\n\n await withLockfile(filePath + '.lock', async () => {\n // Inside the lock: read current on-disk state, merge with our in-memory\n // mapping, and write the result. Our entries take precedence for short ID\n // conflicts (extremely unlikely with random 4-char base36 IDs).\n let merged = mapping;\n let onDiskSize = 0;\n try {\n const onDisk = await loadIdMappingRaw(filePath);\n onDiskSize = onDisk.shortToUlid.size;\n if (onDiskSize > 0) {\n merged = mergeIdMappings(mapping, onDisk);\n }\n } catch {\n // File doesn't exist or is unreadable — proceed with our mapping only\n }\n\n // Safety check: ID mappings are append-only. If the merged result has fewer\n // entries than what's on disk, something went wrong. Refuse to write so the\n // caller can investigate rather than silently destroying entries.\n if (merged.shortToUlid.size < onDiskSize) {\n throw new Error(\n `Refusing to save ID mapping: would lose ${onDiskSize - merged.shortToUlid.size} entries ` +\n `(on-disk: ${onDiskSize}, proposed: ${merged.shortToUlid.size}). ` +\n `ID mappings are append-only — this indicates a bug.`,\n );\n }\n\n const data: Record<string, string> = {};\n const sortedKeys = naturalSort(Array.from(merged.shortToUlid.keys()));\n for (const key of sortedKeys) {\n data[key] = merged.shortToUlid.get(key)!;\n }\n\n const content = stringifyYaml(data);\n await writeFile(filePath, content);\n });\n}\n\n/**\n * Load an ID mapping directly from a file path (internal helper for save merging).\n * Separated from loadIdMapping to avoid coupling the save path to baseDir resolution.\n */\nasync function loadIdMappingRaw(filePath: string): Promise<IdMapping> {\n const content = await readFile(filePath, 'utf-8');\n\n const { data: rawData } = parseYamlToleratingDuplicateKeys<unknown>(content, filePath);\n const data = rawData ?? {};\n\n const parseResult = IdMappingYamlSchema.safeParse(data);\n if (!parseResult.success) {\n throw new Error(`Invalid ID mapping format in ${filePath}: ${parseResult.error.message}`);\n }\n const validData = parseResult.data;\n\n const shortToUlid = new Map<string, string>();\n const ulidToShort = new Map<string, string>();\n\n for (const [shortId, ulid] of Object.entries(validData)) {\n shortToUlid.set(shortId, ulid);\n ulidToShort.set(ulid, shortId);\n }\n\n return { shortToUlid, ulidToShort };\n}\n\n/**\n * Calculate the optimal short ID length based on existing ID count.\n *\n * At 50K issues, switches from 4-char to 5-char IDs to keep\n * collision probability low (~3% per attempt with 4 chars at 50K).\n *\n * With 10 retries per length, actual failure probability is astronomically low.\n */\nexport function calculateOptimalLength(existingCount: number): number {\n return existingCount < 50_000 ? 4 : 5;\n}\n\n/**\n * Generate a unique short ID that doesn't collide with existing ones.\n *\n * Calculates optimal length (4 or 5 chars) based on existing ID count,\n * then retries with the next length if collisions occur.\n *\n * @returns The new short ID\n * @throws If unable to generate a unique ID after max attempts\n */\nexport function generateUniqueShortId(mapping: IdMapping): string {\n const ATTEMPTS_PER_LENGTH = 10;\n const existingCount = mapping.shortToUlid.size;\n const optimalLength = calculateOptimalLength(existingCount);\n\n // Try optimal length first, then fall back to longer if needed\n for (const length of [optimalLength, optimalLength + 1]) {\n for (let attempt = 0; attempt < ATTEMPTS_PER_LENGTH; attempt++) {\n const shortId = generateShortId(length);\n if (!mapping.shortToUlid.has(shortId)) {\n return shortId;\n }\n }\n }\n\n throw new Error(\n `Failed to generate unique short ID after 20 attempts with ${existingCount} existing IDs. ` +\n `This should be extremely rare - please report if you see this error.`,\n );\n}\n\n/**\n * Register a new ID mapping.\n * @param ulid - The ULID (without is- prefix)\n * @param shortId - The short ID (4 chars)\n */\nexport function addIdMapping(mapping: IdMapping, ulid: string, shortId: string): void {\n mapping.shortToUlid.set(shortId, ulid);\n mapping.ulidToShort.set(ulid, shortId);\n}\n\n/**\n * Get the short ID for a ULID.\n * @param ulid - The ULID (without is- prefix)\n * @returns The short ID, or undefined if not found\n */\nexport function getShortId(mapping: IdMapping, ulid: string): string | undefined {\n return mapping.ulidToShort.get(ulid);\n}\n\n/**\n * Get the ULID for a short ID.\n * @param shortId - The short ID\n * @returns The ULID (without is- prefix), or undefined if not found\n */\nexport function getUlid(mapping: IdMapping, shortId: string): string | undefined {\n return mapping.shortToUlid.get(shortId);\n}\n\n/**\n * Check if a short ID exists in the mapping.\n */\nexport function hasShortId(mapping: IdMapping, shortId: string): boolean {\n return mapping.shortToUlid.has(shortId);\n}\n\n/**\n * Create a short ID mapping for a new internal ID.\n * Generates a unique short ID and registers it in the mapping.\n *\n * @param internalId - The internal ID (is-{ulid})\n * @param mapping - The ID mapping to update\n * @returns The generated short ID\n */\nexport function createShortIdMapping(internalId: string, mapping: IdMapping): string {\n // Extract ULID from internal ID (remove prefix)\n const ulid = extractUlidFromInternalId(internalId);\n\n // Check if already mapped\n const existing = mapping.ulidToShort.get(ulid);\n if (existing) {\n return existing;\n }\n\n // Generate unique short ID\n const shortId = generateUniqueShortId(mapping);\n\n // Register mapping\n addIdMapping(mapping, ulid, shortId);\n\n return shortId;\n}\n\n/**\n * Resolve any ID input to an internal ID ({prefix}-{ulid}).\n *\n * Handles:\n * - Internal IDs: {prefix}-{ulid} -> {prefix}-{ulid}\n * - Short IDs: a7k2 -> {prefix}-{ulid from mapping}\n * - Prefixed short IDs: bd-a7k2 -> {prefix}-{ulid from mapping}\n *\n * @param input - The ID input (short ID, prefixed short ID, or internal ID)\n * @param mapping - The ID mapping for short ID resolution\n * @returns The internal ID ({prefix}-{ulid})\n * @throws If the short ID is not found in the mapping\n */\nexport function resolveToInternalId(input: string, mapping: IdMapping): InternalIssueId {\n const lower = input.toLowerCase();\n\n // If it's already an internal ID, return it\n if (isInternalId(lower)) {\n return asInternalId(lower);\n }\n\n // Extract the short ID portion (strips any prefix like \"bd-\" or \"is-\")\n const shortId = extractShortId(lower);\n\n // If it's a full ULID (26 chars), it might be a bare internal ID\n if (shortId.length === 26 && /^[0-9a-z]{26}$/.test(shortId)) {\n return makeInternalId(shortId);\n }\n\n // Must be a short ID - look it up in the mapping\n const ulid = mapping.shortToUlid.get(shortId);\n if (!ulid) {\n throw new Error(`Unknown issue ID: ${input}. ` + `Short ID \"${shortId}\" not found in mapping.`);\n }\n\n return makeInternalId(ulid);\n}\n\n/**\n * Parse an ID mapping from raw YAML content.\n * Used for loading mappings from git show output during conflict resolution.\n *\n * @throws MergeConflictError if content contains merge conflict markers\n */\nexport function parseIdMappingFromYaml(content: string): IdMapping {\n // Parse tolerating duplicate keys — handles post-merge-conflict duplicates\n const { data: rawData, duplicateKeys } = parseYamlToleratingDuplicateKeys<unknown>(content);\n const data = rawData ?? {};\n\n if (duplicateKeys.length > 0) {\n console.warn(\n `Warning: ID mapping YAML contains ${duplicateKeys.length} duplicate key(s): ${duplicateKeys.join(', ')}. ` +\n `Duplicates will be auto-resolved.`,\n );\n }\n\n // Validate with Zod schema\n const parseResult = IdMappingYamlSchema.safeParse(data);\n if (!parseResult.success) {\n throw new Error(`Invalid ID mapping format: ${parseResult.error.message}`);\n }\n const validData = parseResult.data;\n\n const shortToUlid = new Map<string, string>();\n const ulidToShort = new Map<string, string>();\n\n for (const [shortId, ulid] of Object.entries(validData)) {\n shortToUlid.set(shortId, ulid);\n ulidToShort.set(ulid, shortId);\n }\n\n return { shortToUlid, ulidToShort };\n}\n\n/**\n * Ensure all given internal IDs have short ID mappings.\n * Creates missing mappings for any IDs without entries.\n *\n * This repairs state after git merges that may add issue files\n * without corresponding mapping entries (e.g., when outbox issues\n * are merged from a feature branch but ids.yml doesn't include them).\n *\n * When a `historicalMapping` is provided, the function will try to recover\n * the original short ID from that mapping before generating a new random one.\n * This preserves ID stability so that existing references (in docs, PRs,\n * conversations) remain valid.\n *\n * @param internalIds - Array of internal IDs (is-{ulid}) to reconcile\n * @param mapping - The ID mapping to update (mutated in-place)\n * @param historicalMapping - Optional mapping from prior state (e.g., git history) to recover original short IDs\n * @returns Object with `created` (IDs that got new random short IDs) and `recovered` (IDs restored from history)\n */\nexport function reconcileMappings(\n internalIds: string[],\n mapping: IdMapping,\n historicalMapping?: IdMapping,\n): { created: string[]; recovered: string[] } {\n const created: string[] = [];\n const recovered: string[] = [];\n\n for (const id of internalIds) {\n const ulid = extractUlidFromInternalId(id);\n if (mapping.ulidToShort.has(ulid)) {\n continue; // Already has a mapping\n }\n\n // Try to recover original short ID from historical mapping\n const historicalShortId = historicalMapping?.ulidToShort.get(ulid);\n if (historicalShortId && !mapping.shortToUlid.has(historicalShortId)) {\n // Recovered: restore the original short ID\n addIdMapping(mapping, ulid, historicalShortId);\n recovered.push(id);\n } else {\n // No history available or short ID conflicts — generate new random one\n createShortIdMapping(id, mapping);\n created.push(id);\n }\n }\n\n return { created, recovered };\n}\n\n/**\n * Merge two ID mappings by combining all entries from both.\n * ID mappings are always additive (new IDs are only added, never removed),\n * so merging simply unions all key-value pairs.\n *\n * If the same short ID maps to different ULIDs in each mapping (a conflict),\n * the local mapping takes precedence (caller should log a warning).\n *\n * @param local - The local ID mapping\n * @param remote - The remote ID mapping\n * @returns Merged mapping with all entries from both\n */\nexport function mergeIdMappings(local: IdMapping, remote: IdMapping): IdMapping {\n const merged: IdMapping = {\n shortToUlid: new Map(local.shortToUlid),\n ulidToShort: new Map(local.ulidToShort),\n };\n\n // Add all remote entries that don't conflict\n for (const [shortId, ulid] of remote.shortToUlid) {\n if (!merged.shortToUlid.has(shortId)) {\n merged.shortToUlid.set(shortId, ulid);\n merged.ulidToShort.set(ulid, shortId);\n }\n // If shortId already exists with different ulid, keep local (conflict resolution)\n }\n\n // Also check for ULIDs that exist in remote but not in local\n // (different short ID for same ULID - shouldn't happen but handle gracefully)\n for (const [ulid, shortId] of remote.ulidToShort) {\n if (!merged.ulidToShort.has(ulid) && !merged.shortToUlid.has(shortId)) {\n merged.shortToUlid.set(shortId, ulid);\n merged.ulidToShort.set(ulid, shortId);\n }\n }\n\n return merged;\n}\n\n/**\n * Resolve merge conflicts in ids.yml content by extracting both sides and merging.\n *\n * ids.yml is a sorted key-value YAML map where entries are append-only.\n * The most common merge conflict is both sides adding non-overlapping keys,\n * which is trivially auto-resolvable by keeping all entries from both sides.\n *\n * @param content - Raw file content that may contain git merge conflict markers\n * @returns Merged IdMapping with entries from both sides\n */\nexport function resolveIdMappingConflicts(content: string): IdMapping {\n if (!hasMergeConflictMarkers(content)) {\n return parseIdMappingFromYaml(content);\n }\n\n const lines = content.split('\\n');\n const oursLines: string[] = [];\n const theirsLines: string[] = [];\n let inConflict: 'none' | 'ours' | 'theirs' = 'none';\n\n for (const line of lines) {\n if (line.startsWith('<<<<<<< ')) {\n inConflict = 'ours';\n continue;\n }\n if (line === '=======' && inConflict === 'ours') {\n inConflict = 'theirs';\n continue;\n }\n if (line.startsWith('>>>>>>> ') && inConflict === 'theirs') {\n inConflict = 'none';\n continue;\n }\n\n if (inConflict === 'none') {\n oursLines.push(line);\n theirsLines.push(line);\n } else if (inConflict === 'ours') {\n oursLines.push(line);\n } else {\n theirsLines.push(line);\n }\n }\n\n const oursMapping = parseIdMappingFromYaml(oursLines.join('\\n'));\n const theirsMapping = parseIdMappingFromYaml(theirsLines.join('\\n'));\n\n return mergeIdMappings(oursMapping, theirsMapping);\n}\n"],"mappings":"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"}
package/dist/index.mjs CHANGED
@@ -1,4 +1,4 @@
1
- import { A as LOCAL_STATE_FIELD_ORDER, C as GitRemoteName, D as IssueKind, E as IssueId, F as ShortId, I as Timestamp, L as Ulid, M as META_FIELD_ORDER, N as MetaSchema, O as IssueSchema, P as Priority, R as Version, S as GitBranchName, T as IdMappingYamlSchema, _ as DependencyRelationType, b as EntityType, d as ATTIC_ENTRY_FIELD_ORDER, f as AtticEntrySchema, g as Dependency, h as ConfigSchema, j as LocalStateSchema, k as IssueStatus, m as CONFIG_FIELD_ORDER, p as BaseEntity, v as DocCacheConfigSchema, w as ISSUE_FIELD_ORDER, x as ExternalIssueIdInput, y as DocsCacheSchema } from "./yaml-utils-U7l9hhkh.mjs";
2
- import { c as noopLogger, i as serializeIssue, n as parseIssue, t as VERSION } from "./src-BrM6xcdG.mjs";
1
+ import { C as MetaSchema, D as Ulid, E as Timestamp, O as Version, S as META_FIELD_ORDER, T as ShortId, _ as IssueKind, a as ConfigSchema, b as LOCAL_STATE_FIELD_ORDER, c as DocCacheConfigSchema, d as ExternalIssueIdInput, f as GitBranchName, g as IssueId, h as IdMappingYamlSchema, i as CONFIG_FIELD_ORDER, l as DocsCacheSchema, m as ISSUE_FIELD_ORDER, n as AtticEntrySchema, o as Dependency, p as GitRemoteName, r as BaseEntity, s as DependencyRelationType, t as ATTIC_ENTRY_FIELD_ORDER, u as EntityType, v as IssueSchema, w as Priority, x as LocalStateSchema, y as IssueStatus } from "./schemas-BQYmDnkv.mjs";
2
+ import { c as noopLogger, i as serializeIssue, n as parseIssue, t as VERSION } from "./src-DQcOQnFp.mjs";
3
3
 
4
4
  export { ATTIC_ENTRY_FIELD_ORDER, AtticEntrySchema, BaseEntity, CONFIG_FIELD_ORDER, ConfigSchema, Dependency, DependencyRelationType, DocCacheConfigSchema, DocsCacheSchema, EntityType, ExternalIssueIdInput, GitBranchName, GitRemoteName, ISSUE_FIELD_ORDER, IdMappingYamlSchema, IssueId, IssueKind, IssueSchema, IssueStatus, LOCAL_STATE_FIELD_ORDER, LocalStateSchema, META_FIELD_ORDER, MetaSchema, Priority, ShortId, Timestamp, Ulid, VERSION, Version, noopLogger, parseIssue, serializeIssue };