@jkwd/inbase 0.1.21 → 0.1.23

package/apps/explorer/scripts/scan-target.mjs

@@ -49,7 +49,23 @@ function resolvesThroughIgnored(absolutePath, root) {
   }
 }
 
-function walk(dir, root, ignoreSets, acc = []) {
+function isInside(filePath, root) {
+  const file = path.resolve(filePath)
+  const base = path.resolve(root)
+  return file === base || file.startsWith(base + path.sep)
+}
+
+function dataDirToSkip(root, dest) {
+  if (!dest) return null
+  const dataRoot = path.dirname(path.resolve(dest))
+  const target = path.resolve(root)
+  if (dataRoot === target) return null
+  const relative = path.relative(target, dataRoot)
+  if (!relative || relative.startsWith('..') || path.isAbsolute(relative)) return null
+  return dataRoot
+}
+
+function walk(dir, root, ignoreSets, skipRoot = null, acc = []) {
   const localRules = readGitignoreRules(dir)
   const nextSets = localRules.length
     ? [...ignoreSets, { base: dir, rules: localRules }]
@@ -62,6 +78,7 @@ function walk(dir, root, ignoreSets, acc = []) {
   }
   for (const entry of entries) {
     const absolutePath = path.join(dir, entry.name)
+    if (skipRoot && isInside(absolutePath, skipRoot)) continue
     const relative = toPosix(path.relative(root, absolutePath))
     if (
       shouldIgnoreRelativePath(relative) ||
@@ -79,7 +96,7 @@ function walk(dir, root, ignoreSets, acc = []) {
       }
     }
     if (stat.isDirectory()) {
-      walk(absolutePath, root, nextSets, acc)
+      walk(absolutePath, root, nextSets, skipRoot, acc)
       continue
     }
     if (!stat.isFile()) continue
@@ -89,8 +106,8 @@ function walk(dir, root, ignoreSets, acc = []) {
   return acc
 }
 
-function listSourceAbsolutes(root) {
-  return walk(root, root, collectGitignoreSets(root))
+function listSourceAbsolutes(root, skipRoot = null) {
+  return walk(root, root, collectGitignoreSets(root), skipRoot)
 }
 
 function languageOf(filePath) {
@@ -192,7 +209,7 @@ export function scanTarget({
     )
   }
 
-  const absoluteFiles = listSourceAbsolutes(root)
+  const absoluteFiles = listSourceAbsolutes(root, dataDirToSkip(root, dest))
   const folders = new Map()
   ensureFolder(folders, '.', name)
 

package/apps/explorer/scripts/session-store.d.ts

@@ -51,9 +51,11 @@ export type DiffManifest = {
     | 'finished'
     | 'stopped'
   awaitingAttach?: boolean
+  color?: string
   currentStep: number
   activeDiffId: string | null
   pendingInstruction: string | null
+  pendingExplain?: boolean
   initialInstruction?: string | null
   contextFiles?: SessionContextFile[]
   workStartedAt: string | null
@@ -61,6 +63,8 @@ export type DiffManifest = {
   createdAt: string
   updatedAt: string
   diffs: DiffEntry[]
+  blueprintRevision?: number
+  localBlueprintRevision?: number
 }
 
 export function assertSessionId(value: unknown): string
@@ -103,6 +107,11 @@ export function discardInactiveDiffSessions(
   targetRoot?: string | null,
   waiterIds?: Iterable<string>,
 ): string[]
+export function recycleDisconnectedSessions(
+  dataDir: string,
+  targetRoot?: string | null,
+  waiterIds?: Iterable<string>,
+): string[]
 export function recoverOpenDiffSessions(
   dataDir: string,
   targetRoot?: string | null,
@@ -136,11 +145,13 @@ export function setupSession(
     sessionId?: string
     name?: string
     feature?: string
+    focus?: boolean
   },
 ): DiffManifest
 export function attachSession(
   dataDir: string,
   sessionId?: string | null,
+  options?: { color?: string | null },
 ): DiffManifest
 export function setInitialInstruction(
   dataDir: string,
@@ -150,6 +161,32 @@ export function setInitialInstruction(
 export const MAX_CONTEXT_FILES: number
 export const MAX_CONTEXT_FILE_BYTES: number
 export const MAX_CONTEXT_TOTAL_BYTES: number
+export const SESSION_SLOT_COUNT: number
+export const SESSION_COLORS: Array<{ id: string; name: string; hex: string }>
+export const SESSION_COLOR_ALIASES: Record<string, string>
+export const GLOBAL_BLUEPRINT_COLOR: { id: 'global'; name: 'Global'; hex: string }
+export function resolveSessionColor(
+  colorId: string | null | undefined,
+): { id: string; name: string; hex: string } | null
+export function parseSessionColorQuery(
+  value: string | null | undefined,
+): { id: string; name: string; hex: string } | null
+export function colorUnknownMessage(query?: string | null): string
+export function colorBusyMessage(colorName: string): string
+export function colorMissingMessage(colorName: string): string
+export function isGlobalBlueprintColor(colorId: string | null | undefined): boolean
+export function findSessionIdByColor(
+  dataDir: string,
+  colorId: string | null | undefined,
+): string | null
+export const CHAT_LIMIT_MESSAGE: string
+export const NOT_RUNNING_MESSAGE: string
+export function enableSessionPool(dataDir: string, count?: number): void
+export function sessionPoolSize(dataDir: string): number
+export function ensureSessionPool(
+  dataDir: string,
+  options?: { count?: number; focus?: boolean },
+): DiffManifest[]
 export function listContextFiles(
   dataDir: string,
   sessionId: string,
@@ -189,6 +226,18 @@ export type SessionBlueprint = {
 }
 export function emptyBlueprint(): SessionBlueprint
 export function readBlueprint(dataDir: string, sessionId?: string): SessionBlueprint
+export function readLocalBlueprint(dataDir: string, sessionId?: string | null): SessionBlueprint
+export function readBlueprintByColor(
+  dataDir: string,
+  colorId?: string | null,
+): SessionBlueprint
+export type LocalBlueprint = SessionBlueprint & {
+  color: string
+  colorName: string
+  colorHex: string
+  sessionId: string
+}
+export function listLocalBlueprints(dataDir: string): LocalBlueprint[]
 export function writeBlueprint(
   dataDir: string,
   blueprint: SessionBlueprint,
@@ -198,17 +247,36 @@ export function writeBlueprint(
   sessionId: string,
   blueprint: SessionBlueprint,
 ): SessionBlueprint
-export function setBlueprintHidden(dataDir: string, hidden: boolean): SessionBlueprint
-export function clearBlueprint(dataDir: string): SessionBlueprint
+export function writeLocalBlueprint(
+  dataDir: string,
+  sessionId: string,
+  blueprint: Partial<SessionBlueprint>,
+): SessionBlueprint
+export function writeBlueprintByColor(
+  dataDir: string,
+  colorId: string | null | undefined,
+  blueprint: Partial<SessionBlueprint>,
+): SessionBlueprint
+export function setBlueprintHidden(
+  dataDir: string,
+  hidden: boolean,
+  colorId?: string | null,
+): SessionBlueprint
+export function clearBlueprint(
+  dataDir: string,
+  colorId?: string | null,
+): SessionBlueprint
 export function cleanupBlueprint(
   dataDir: string,
   knownFileIds?: string[],
   knownFolderPaths?: string[],
+  colorId?: string | null,
 ): SessionBlueprint
 export function markBlueprintSeen(
   dataDir: string,
   sessionId: string,
   revision: number,
+  localRevision?: number,
 ): DiffManifest | null
 export function answerBlueprint(
   dataDir: string,
@@ -219,6 +287,7 @@ export function updateBlueprint(
   dataDir: string,
   sessionId?: string | null,
   input?: {
+    color?: string | null
     userCreatedBlocks?: unknown[]
     userCreatedIslands?: unknown[]
     addedFunctions?: unknown[]
@@ -231,15 +300,7 @@ export function updateBlueprint(
 export function sendBlueprint(
   dataDir: string,
   sessionId: string,
-  input?: {
-    userCreatedBlocks?: unknown[]
-    userCreatedIslands?: unknown[]
-    addedFunctions?: unknown[]
-    addedVariables?: unknown[]
-    addedImports?: unknown[]
-    notes?: unknown[]
-    pointers?: unknown[]
-  },
+  input?: unknown,
 ): DiffManifest
 export function maybeStartVisualizerHandshake(
   dataDir: string,
@@ -341,6 +402,20 @@ export function requestReplan(
   instruction: string,
   targetRoot?: string | null,
 ): DiffManifest
+export function notifySessionExplain(
+  dataDir: string,
+  sessionId: string,
+  detail?: string,
+): DiffManifest | null
+export function requestExplainProposal(
+  dataDir: string,
+  sessionId: string,
+  diffId?: string | null,
+): DiffManifest
+export function consumeExplainRequest(
+  dataDir: string,
+  sessionId: string,
+): DiffManifest | null
 export function stopSession(
   dataDir: string,
   sessionId: string,