@skitterbyte/skitterspec 2.0.0 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skitterbyte/skitterspec",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Spec-driven development for Claude Code — a tracker-free filesystem workflow: lifecycle skills and per-spec isolation. For Linear sync, install @skitterbyte/skitterspec-linear instead.",
   "keywords": [
     "claude",

package/src/cli.js

@@ -17,7 +17,7 @@ const {
   freeSlot,
   portOffset,
 } = require('./env/registry.js')
-const { resolveSpec, resolveBaseBranch } = require('./env/resolve.js')
+const { resolveSpec, resolveBaseBranch, repoInfo, expandTokens, splitPrefix } = require('./env/resolve.js')
 const { ensureWorktreeDirTrusted } = require('./env/trust.js')
 const { planUp } = require('./env/provision.js')
 const { planDown } = require('./env/teardown.js')
@@ -332,7 +332,19 @@ function specEnvIntegrate(dir, config, specArg) {
   const commonDir = gitReader(dir)(['rev-parse', '--git-common-dir'])
   const mainRepoPath = commonDir ? path.dirname(path.resolve(dir, commonDir)) : dir
 
-  const spec = resolveSpec(specArg, mainRepoPath, config)
+  // A spec authored entirely on its branch may not exist in the primary
+  // checkout's specs/** (it was never committed to base) — but its worktree
+  // does, and the worktree path is derivable from config without the folder.
+  // Offer it as a fallback search location so integrate can still find the spec.
+  const { slug } = splitPrefix(path.basename(specArg))
+  const { repo, repoSlug } = repoInfo(mainRepoPath)
+  const wtTokens = { repo, repoSlug, slug }
+  const worktreeGuess = path.resolve(
+    mainRepoPath,
+    expandTokens(config.worktree.root, wtTokens),
+    expandTokens(config.worktree.folderPattern, wtTokens),
+  )
+  const spec = resolveSpec(specArg, mainRepoPath, config, { searchDirs: [worktreeGuess] })
 
   if (!fs.existsSync(spec.worktreePath)) {
     process.stdout.write(

package/src/env/resolve.js

@@ -20,12 +20,17 @@ const BUCKETS = ['backlog', 'in-progress', 'complete', 'cancelled']
 
 // Find the spec folder under specs/<bucket>/<name>. `specArg` may be a bare
 // folder name or a path — only its basename is matched against the buckets.
-function findSpecFolder(specArg, dir) {
+// Searches `dir` first, then any `extraDirs` in order — so a caller (e.g.
+// `spec-env integrate`) can fall back to a worktree checkout for a spec that
+// was authored on its branch and never committed to the primary checkout.
+function findSpecFolder(specArg, dir, extraDirs = []) {
   const name = path.basename(specArg)
-  for (const bucket of BUCKETS) {
-    const abs = path.join(dir, 'specs', bucket, name)
-    if (fs.existsSync(abs) && fs.statSync(abs).isDirectory()) {
-      return { folder: name, bucket, path: abs }
+  for (const root of [dir, ...extraDirs]) {
+    for (const bucket of BUCKETS) {
+      const abs = path.join(root, 'specs', bucket, name)
+      if (fs.existsSync(abs) && fs.statSync(abs).isDirectory()) {
+        return { folder: name, bucket, path: abs }
+      }
     }
   }
   return null
@@ -149,9 +154,13 @@ function resolveBaseBranch(config, git) {
 /**
  * Resolve a spec argument to its identity + isolation coordinates.
  * Throws a clear Error when the spec folder can't be found.
+ *
+ * `opts.searchDirs` adds fallback checkout roots to look under (after `dir`) when
+ * locating the spec folder; identity/coordinate tokens still expand against `dir`
+ * (the primary checkout), so a worktree-only spec resolves to the right base.
  */
-function resolveSpec(specArg, dir, config) {
-  const found = findSpecFolder(specArg, dir)
+function resolveSpec(specArg, dir, config, opts = {}) {
+  const found = findSpecFolder(specArg, dir, opts.searchDirs || [])
   if (!found) {
     throw new Error(`spec not found under specs/**: ${specArg}`)
   }