@gotcos/glasses-server 6.15.2 → 6.15.3

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 6.15.3
+
+- Make `COS_WORKDIR` the authoritative Claude, Codex, and Cursor workspace.
+  Legacy provider-specific and `COS_SCRIPTS_DIR` paths remain compatibility
+  fallbacks, so pipeline scripts can stay separate from the agent workspace.
+- Add workspace-precedence coverage for migrated LaunchAgent environments.
+
 ## 6.15.2
 
 - Validate the inherited Kokoro Python runtime before skipping bootstrap, so a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gotcos/glasses-server",
-  "version": "6.15.2",
+  "version": "6.15.3",
   "description": "COS Glasses — self-hosted AI heads-up-display server for Even G2 smart glasses, powered by your local Claude Code or Codex CLI",
   "type": "module",
   "bin": {

package/server/lib/claude-bridge.ts

@@ -11,7 +11,7 @@ import { writeFileSync, readFileSync, unlinkSync, existsSync } from 'node:fs'
 import { appendFileSync } from 'node:fs'
 import { COS_SCRIPTS_DIR } from './python-bridge.js'
 import { cleanupModelImageInputs, type ModelImageInput } from './model-image-input.js'
-import { cosBrainDir } from './launch-dir.js'
+import { resolveProviderWorkDir } from './launch-dir.js'
 import { logTokenAudit } from './token-audit.js'
 import { buildSystemPrompt, buildLightweightSystemPrompt, buildPrewarmSystemPrompt, getCachedContextInstant } from './context-builder.js'
 import { getHistory, addExchange, setExchangeAttachments, removeExchange, formatHistoryForPrompt, getOrCreateSession, isNewSession, markSessionNotified, getSessionModel, getSessionRaw, replaceLastExchangeWithSummary, type ModelPreference, type PromptReference } from './conversation.js'
@@ -225,7 +225,7 @@ export async function preWarmCLI(): Promise<void> {
     ], {
       stdio: ['pipe', 'pipe', 'pipe'],
       env,
-      cwd: COS_SCRIPTS_DIR ?? cosBrainDir() ?? process.cwd(),
+      cwd: resolveProviderWorkDir({ scriptsDir: COS_SCRIPTS_DIR }),
     })
 
     let buffer = ''
@@ -528,7 +528,7 @@ export async function callClaudeStreaming(
   const env = { ...process.env }
   delete env.CLAUDECODE
   if (outputImagePublisher) Object.assign(env, outputImagePublisher.env)
-  const cliCwd = COS_SCRIPTS_DIR ?? cosBrainDir() ?? process.cwd()
+  const cliCwd = resolveProviderWorkDir({ scriptsDir: COS_SCRIPTS_DIR })
   const inactivityMs = INACTIVITY_BY_MODEL[resolvedModel]
   const defaultWallMax = WALL_MAX_BY_MODEL[resolvedModel]
   const effortWallMax = resolvedEffort === 'max' || resolvedEffort === 'ultracode'

package/server/lib/codex-run-ledger.ts

@@ -2,7 +2,7 @@ import crypto from 'node:crypto'
 import { appendFileSync, chmodSync, existsSync, mkdirSync, readFileSync } from 'node:fs'
 import { dirname, resolve } from 'node:path'
 import { COS_SCRIPTS_DIR } from './python-bridge.js'
-import { cosBrainDir } from './launch-dir.js'
+import { resolveProviderWorkDir } from './launch-dir.js'
 import { CODEX_ENGINE_SESSION_TTL_MS, type CodexTrustMode } from './codex-engine-sessions.js'
 import {
   CODEX_FRONTIER_MODEL,
@@ -84,16 +84,10 @@ export function areCodexContentPreviewsEnabled(): boolean {
 }
 
 export function getCodexExecutionCwd(): string {
-  const configured = process.env.CODEX_GLASSES_WORKDIR?.trim()
-  if (configured) return resolve(configured)
-  if (COS_SCRIPTS_DIR) return resolve(COS_SCRIPTS_DIR, '..', '..')
-  // A Starter-Kit COS in the directory the user launched npx from — Codex
-  // loads its AGENTS.md brain natively when run there.
-  const brain = cosBrainDir()
-  if (brain) return brain
-  // Last resort when neither CODEX_GLASSES_WORKDIR nor COS_SCRIPTS_DIR is set:
-  // the server's own working dir (codex glasses is an optional, env-configured feature).
-  return process.cwd()
+  return resolveProviderWorkDir({
+    legacyProviderDir: process.env.CODEX_GLASSES_WORKDIR,
+    scriptsDir: COS_SCRIPTS_DIR,
+  })
 }
 
 export function getCodexTrustMode(): CodexTrustMode {

package/server/lib/launch-dir.ts

@@ -7,8 +7,9 @@
 // spawns of claude/codex use IT as their working directory — so the CLIs load
 // the user's brain exactly as they would in a terminal session in that folder.
 //
-// Precedence stays: COS_SCRIPTS_DIR (full COS pipeline) > detected brain dir >
-// process.cwd(). Explicit config always wins.
+// Provider precedence is: selected COS_WORKDIR > legacy provider override >
+// COS_SCRIPTS_DIR repository root > process.cwd(). Pipeline data still uses
+// COS_SCRIPTS_DIR independently.
 import { existsSync } from 'node:fs'
 import { join, resolve } from 'node:path'
 
@@ -33,3 +34,28 @@ export function cosBrainDir(): string | null {
   cached = resolveCosBrainDir(process.env.COS_WORKDIR ?? process.env.COS_LAUNCH_DIR)
   return cached
 }
+
+/**
+ * Resolve the provider working directory from one authoritative contract.
+ * COS_WORKDIR (via cosBrainDir) is the user-selected agent workspace and must
+ * outrank legacy provider-specific and pipeline locations. COS_SCRIPTS_DIR is
+ * still used by the Python pipeline; it is only a cwd fallback here.
+ */
+export function resolveProviderWorkDir(options: {
+  legacyProviderDir?: string | null
+  scriptsDir?: string | null
+  fallback?: string
+} = {}): string {
+  const brain = cosBrainDir()
+  if (brain) return brain
+  const legacy = options.legacyProviderDir?.trim()
+  if (legacy) return resolve(legacy)
+  const scripts = options.scriptsDir?.trim()
+  if (scripts) return resolve(scripts, '..', '..')
+  return resolve(options.fallback ?? process.cwd())
+}
+
+/** Test-only cache reset for environment-precedence coverage. */
+export function resetCosBrainDirCacheForTests(): void {
+  cached = undefined
+}