@turmind/halo 0.2.3 → 0.2.5

package/dist/index.js

@@ -608,7 +608,26 @@ function expandEnv(raw) {
     return "";
   return raw.replace(ENV_PATTERN, (m, name) => process.env[name] ?? m);
 }
-function getServerSecret(namespaceId, key) {
+function getWorkspaceSettings(workspaceRoot) {
+  const p = path3.join(workspaceRoot, ".halo", "settings.yaml");
+  let mtimeMs = 0;
+  try {
+    mtimeMs = fs3.statSync(p).mtimeMs;
+  } catch {
+  }
+  const hit = _wsSettingsCache.get(workspaceRoot);
+  if (hit && hit.mtimeMs === mtimeMs)
+    return hit.data;
+  const entry = { mtimeMs, data: loadYamlFile(p) };
+  _wsSettingsCache.set(workspaceRoot, entry);
+  return entry.data;
+}
+function getServerSecret(namespaceId, key, workspaceRoot) {
+  if (workspaceRoot) {
+    const ws = readYamlValue(getWorkspaceSettings(workspaceRoot), `${namespaceId}.secrets.${key}`);
+    if (ws != null && String(ws) !== "")
+      return expandEnv(String(ws));
+  }
   return expandEnv(settingsValue(`${namespaceId}.secrets.${key}`));
 }
 function reloadSandboxConfig() {
@@ -637,13 +656,13 @@ function resolveMaxOutputTokens(modelId) {
   const entry = findModelEntry(modelId);
   return entry?.maxOutputTokens ?? 16384;
 }
-function resolveApiKey(providerId) {
-  return getServerSecret(providerId, "api_key") || void 0;
+function resolveApiKey(providerId, workspaceRoot) {
+  return getServerSecret(providerId, "api_key", workspaceRoot) || void 0;
 }
-function resolveAwsCredentials(providerId = "aws-bedrock-claude-invoke") {
+function resolveAwsCredentials(providerId = "aws-bedrock-claude-invoke", workspaceRoot) {
   return {
-    accessKeyId: getServerSecret(providerId, "access_key_id"),
-    secretAccessKey: getServerSecret(providerId, "secret_access_key")
+    accessKeyId: getServerSecret(providerId, "access_key_id", workspaceRoot),
+    secretAccessKey: getServerSecret(providerId, "secret_access_key", workspaceRoot)
   };
 }
 function resolveThinkingMode(modelId) {
@@ -687,7 +706,7 @@ function modelSupportsAudio(modelId, override) {
 function getModelsRegistry() {
   return modelsRegistry();
 }
-var HALO_HOME2, HALO_GLOBAL_DIR, HALO_SECRETS_DIR, _modelsRegistryCache, _systemConfig, SETTINGS_PATH, _settingsCache, _schemaDefaultsCache, ENV_PATTERN, config, HIDDEN_DIRS_DEFAULT, HIDDEN_FILES_DEFAULT;
+var HALO_HOME2, HALO_GLOBAL_DIR, HALO_SECRETS_DIR, _modelsRegistryCache, _systemConfig, SETTINGS_PATH, _settingsCache, _schemaDefaultsCache, ENV_PATTERN, _wsSettingsCache, config, HIDDEN_DIRS_DEFAULT, HIDDEN_FILES_DEFAULT;
 var init_config = __esm({
   "packages/server/dist/config.js"() {
     "use strict";
@@ -701,6 +720,7 @@ var init_config = __esm({
     _settingsCache = null;
     _schemaDefaultsCache = null;
     ENV_PATTERN = /<<([A-Z_][A-Z0-9_]*)>>/g;
+    _wsSettingsCache = /* @__PURE__ */ new Map();
     config = {
       server: {
         port: systemInt("HALO_PORT", "server.port", 9527),
@@ -1841,6 +1861,7 @@ __export(init_exports, {
   ensureHaloHome: () => ensureHaloHome,
   ensureWorkspaceHalo: () => ensureWorkspaceHalo,
   listOptionalSkillIds: () => listOptionalSkillIds,
+  mergeAgentYaml: () => mergeAgentYaml,
   readInstalledOptionalSkills: () => readInstalledOptionalSkills,
   readSeedVersion: () => readSeedVersion,
   writeInstalledOptionalSkills: () => writeInstalledOptionalSkills
@@ -1888,6 +1909,10 @@ function mergeAgentYaml(srcAbs, dstAbs) {
     if (userModel != null) {
       templateDoc.set("model", userModel);
     }
+    const userContext = userDoc.get("context");
+    if (userContext != null) {
+      templateDoc.set("context", userContext);
+    }
     fs6.writeFileSync(dstAbs, templateDoc.toString(), "utf-8");
   } catch (err) {
     console.log(`[Init] mergeAgentYaml fallback (force-copy) for ${dstAbs}: ${err instanceof Error ? err.message : String(err)}`);
@@ -7878,9 +7903,9 @@ do delegate, say so in one line and keep going.`;
         const promptCaching = rawCaching === "1h" ? "1h" : rawCaching === "5m" ? "5m" : rawCaching ? true : void 0;
         const thinkingConfig = yamlConfig?.model?.thinking;
         const thinkingMode = resolveThinkingMode(modelId);
-        const aws = resolveAwsCredentials(providerId);
+        const aws = resolveAwsCredentials(providerId, this.host.workspaceRoot);
         const awsCreds = aws.accessKeyId && aws.secretAccessKey ? aws : void 0;
-        const apiKey = resolveApiKey(providerId);
+        const apiKey = resolveApiKey(providerId, this.host.workspaceRoot);
         const agent = createModelRuntime(providerId, {
           modelId,
           endpoint,
@@ -18769,6 +18794,12 @@ var init_agentcore = __esm({
 // packages/server/dist/ws/file-watcher.js
 import fs41 from "node:fs";
 import path45 from "node:path";
+function enqueueNativeOp(op) {
+  const result = nativeOpChain.then(op);
+  nativeOpChain = result.catch(() => {
+  });
+  return result;
+}
 function isUnwatchablePath(absPath) {
   const norm = path45.resolve(absPath);
   if (norm === "/" || norm === path45.parse(norm).root)
@@ -18780,7 +18811,7 @@ function isUnwatchablePath(absPath) {
   }
   return null;
 }
-var IGNORED_SEGMENTS, IGNORE_GLOBS, WorkspaceWatcher;
+var IGNORED_SEGMENTS, IS_WIN32, IGNORED_SEGMENT_SET, NATIVE_IGNORE, nativeOpChain, WorkspaceWatcher;
 var init_file_watcher = __esm({
   "packages/server/dist/ws/file-watcher.js"() {
     "use strict";
@@ -18844,7 +18875,10 @@ var init_file_watcher = __esm({
       "System Volume Information",
       "AppData"
     ];
-    IGNORE_GLOBS = IGNORED_SEGMENTS.flatMap((seg) => [seg, `**/${seg}/**`]);
+    IS_WIN32 = process.platform === "win32";
+    IGNORED_SEGMENT_SET = new Set(IGNORED_SEGMENTS);
+    NATIVE_IGNORE = IS_WIN32 ? IGNORED_SEGMENTS : IGNORED_SEGMENTS.flatMap((seg) => [seg, `**/${seg}/**`]);
+    nativeOpChain = Promise.resolve();
     WorkspaceWatcher = class {
       subscription = null;
       workspaceRoot = null;
@@ -18852,33 +18886,55 @@ var init_file_watcher = __esm({
       /** Debounce: batch rapid changes into a single notification per path */
       pending = /* @__PURE__ */ new Map();
       flushTimer = null;
+      /** Bumped by every start()/stop(). A start() whose subscribe resolves after
+       *  a newer start()/stop() has bumped the epoch is stale: assigning its
+       *  subscription would overwrite (and leak) the current one, so it tears its
+       *  own subscription down instead. */
+      startEpoch = 0;
       setCallback(cb) {
         this.callback = cb;
       }
       async start(workspaceRoot) {
-        if (this.subscription && this.workspaceRoot === workspaceRoot)
-          return;
-        await this.stop();
         const reject = isUnwatchablePath(workspaceRoot);
         if (reject) {
           console.warn(`[FileWatcher] refusing to watch ${workspaceRoot} (${reject}) \u2014 Explorer live-refresh disabled for this workspace`);
           return;
         }
-        this.workspaceRoot = workspaceRoot;
+        let root = workspaceRoot;
+        try {
+          root = fs41.realpathSync(workspaceRoot);
+        } catch {
+        }
+        if (this.subscription && this.workspaceRoot === root)
+          return;
+        await this.stop();
+        const epoch = ++this.startEpoch;
+        this.workspaceRoot = root;
         try {
           const { default: watcher } = await import("@parcel/watcher");
-          this.subscription = await watcher.subscribe(workspaceRoot, (err, events) => {
+          const sub = await enqueueNativeOp(() => watcher.subscribe(root, (err, events) => {
             if (err) {
-              console.warn(`[FileWatcher] watcher error on ${workspaceRoot}: ${err.message}`);
+              console.warn(`[FileWatcher] watcher error on ${root}: ${err.message}`);
               return;
             }
             for (const e of events)
               this.handleEvent(e.type, e.path);
-          }, { ignore: IGNORE_GLOBS });
+          }, { ignore: NATIVE_IGNORE }));
+          if (this.startEpoch !== epoch) {
+            void enqueueNativeOp(() => sub.unsubscribe()).catch((err) => {
+              console.warn(`[FileWatcher] failed to unsubscribe superseded watch on ${root}: ${err instanceof Error ? err.message : String(err)}`);
+            });
+            return;
+          }
+          this.subscription = sub;
+          console.debug(`[FileWatcher] watching ${root}`);
         } catch (err) {
-          console.warn(`[FileWatcher] failed to watch ${workspaceRoot}: ${err instanceof Error ? err.message : String(err)}`);
-          this.subscription = null;
-          this.workspaceRoot = null;
+          const detail = err instanceof Error ? err.stack ?? err.message : String(err);
+          console.warn(`[FileWatcher] failed to watch ${root} \u2014 Explorer live-refresh disabled: ${detail}`);
+          if (this.startEpoch === epoch) {
+            this.subscription = null;
+            this.workspaceRoot = null;
+          }
         }
       }
       /** Map a parcel event to our add/change/unlink/addDir/unlinkDir shape and
@@ -18894,6 +18950,8 @@ var init_file_watcher = __esm({
         if (!raw || raw.startsWith(".."))
           return;
         const rel = raw.split(path45.sep).join("/");
+        if (IS_WIN32 && rel.split("/").some((seg) => IGNORED_SEGMENT_SET.has(seg)))
+          return;
         let action;
         if (type === "delete") {
           action = "unlink";
@@ -18938,6 +18996,7 @@ var init_file_watcher = __esm({
         this.pending.set(rel, { path: rel, action });
       }
       async stop() {
+        this.startEpoch++;
         if (this.flushTimer)
           clearTimeout(this.flushTimer);
         this.flushTimer = null;
@@ -18947,11 +19006,16 @@ var init_file_watcher = __esm({
         this.pending.clear();
         if (!sub)
           return;
-        await Promise.race([
-          sub.unsubscribe().catch(() => {
-          }),
-          new Promise((resolve2) => setTimeout(resolve2, 2e3))
+        const settled = enqueueNativeOp(() => sub.unsubscribe()).then(() => true, (err) => {
+          console.warn(`[FileWatcher] unsubscribe failed: ${err instanceof Error ? err.message : String(err)}`);
+          return true;
+        });
+        const done = await Promise.race([
+          settled,
+          new Promise((resolve2) => setTimeout(() => resolve2(false), 2e3))
         ]);
+        if (!done)
+          console.warn("[FileWatcher] unsubscribe still pending after 2s \u2014 continuing; next subscribe will wait for it");
       }
       scheduleFlush() {
         if (this.flushTimer)
@@ -19010,6 +19074,11 @@ var init_git_dir_watcher = __esm({
           this.watcher = fs42.watch(gitDir, { persistent: true, recursive: false }, (_eventType, filename) => {
             this.handleGitEvent(filename);
           });
+          this.watcher.on("error", (err) => {
+            console.warn(`[GitDirWatcher] watch error on ${gitDir}: ${err.message} \u2014 git auto-refresh disabled`);
+            this.closeWatcher();
+            this.mode = null;
+          });
           this.mode = "git";
         } catch (err) {
           console.warn(`[GitDirWatcher] failed to watch ${gitDir}: ${err instanceof Error ? err.message : String(err)}`);
@@ -19024,6 +19093,11 @@ var init_git_dir_watcher = __esm({
           this.watcher = fs42.watch(workspaceRoot, { persistent: true, recursive: false }, (_eventType, filename) => {
             this.handleParentEvent(filename);
           });
+          this.watcher.on("error", (err) => {
+            console.warn(`[GitDirWatcher] watch error on ${workspaceRoot}: ${err.message} \u2014 git auto-refresh disabled`);
+            this.closeWatcher();
+            this.mode = null;
+          });
           this.mode = "parent";
         } catch (err) {
           console.warn(`[GitDirWatcher] failed to watch ${workspaceRoot}: ${err instanceof Error ? err.message : String(err)}`);
@@ -19663,6 +19737,8 @@ function setupWebSocketHandler(deps) {
         client2.unsubscribeEvents?.();
         client2.sessionId = await sm.createSession(agentId, null, "Explorer chat", void 0, msg.sessionId);
         client2.unsubscribeEvents = sm.registerEventListener(client2.sessionId, createEventListener(client2));
+        const ctxConfig = await sm.getContextConfig(client2.sessionId);
+        sendJson(ws, { type: "state:snapshot", snapshot: { activePlan: null, agents: [], recentMessages: [], sessionId: client2.sessionId, maxContextTokens: ctxConfig.maxTokens, agentId } });
       } else if (client2.sessionId !== msg.sessionId) {
         client2.unsubscribeEvents?.();
         client2.sessionId = msg.sessionId;
@@ -26311,6 +26387,22 @@ function isProcessAlive(pid) {
     return false;
   }
 }
+function readGitSha() {
+  if (!fs53.existsSync(path61.join(PROJECT_ROOT, "pnpm-workspace.yaml")) || !fs53.existsSync(path61.join(PROJECT_ROOT, ".git")))
+    return null;
+  try {
+    const rev = spawnSync4("git", ["rev-parse", "--short", "HEAD"], { cwd: PROJECT_ROOT, encoding: "utf-8" });
+    if (rev.status !== 0)
+      return null;
+    const sha = rev.stdout.trim();
+    if (!sha)
+      return null;
+    const dirty = spawnSync4("git", ["status", "--porcelain"], { cwd: PROJECT_ROOT, encoding: "utf-8" }).stdout.trim().length > 0;
+    return dirty ? `${sha}-dirty` : sha;
+  } catch {
+    return null;
+  }
+}
 function resolveFrontendDir() {
   if (process.env.HALO_FRONTEND_DIR)
     return path61.resolve(process.env.HALO_FRONTEND_DIR);
@@ -26337,7 +26429,7 @@ async function gracefulShutdown(signal) {
   console.log("[Server] Shutdown complete");
   process.exit(0);
 }
-var __dirname3, PORT, HALO_VERSION, PROJECT_ROOT, HALO_HOME4, AGENTCORE, app, allowlist, authRoutes, fileRoutes, gitRoutes, agentConfigRoutes, skillRoutes, settingsRoutes, evolutionRoutes, cronRoutes, channelDb, registry, sessionRoutes, showRoutes, metricsRoutes, commandRoutes, FRONTEND_DIR, server, wss;
+var __dirname3, PORT, HALO_VERSION, PROJECT_ROOT, HALO_HOME4, GIT_SHA, AGENTCORE, app, allowlist, authRoutes, fileRoutes, gitRoutes, agentConfigRoutes, skillRoutes, settingsRoutes, evolutionRoutes, cronRoutes, channelDb, registry, sessionRoutes, showRoutes, metricsRoutes, commandRoutes, FRONTEND_DIR, server, wss;
 var init_dist2 = __esm({
   async "packages/server/dist/index.js"() {
     "use strict";
@@ -26375,9 +26467,10 @@ var init_dist2 = __esm({
     init_git_ssh();
     __dirname3 = path61.dirname(fileURLToPath3(import.meta.url));
     PORT = config.server.port;
-    HALO_VERSION = "0.2.3";
+    HALO_VERSION = "0.2.5";
     PROJECT_ROOT = findProjectRoot();
     HALO_HOME4 = path61.join(homedir24(), ".halo");
+    GIT_SHA = readGitSha();
     if (!fs53.existsSync(path61.join(HALO_HOME4, "global", ".template-version"))) {
       process.stderr.write("\x1B[31m[Server] ~/.halo/global/ not initialized. Run `halo setup` first.\x1B[0m\n");
       process.exit(1);
@@ -26447,7 +26540,8 @@ var init_dist2 = __esm({
         timestamp: Date.now(),
         uptime: process.uptime(),
         engine: "agent",
-        version: HALO_VERSION
+        version: HALO_VERSION,
+        gitSha: GIT_SHA
       });
     });
     fileRoutes = createFileRoutes();
@@ -27268,7 +27362,7 @@ import path62 from "node:path";
 import fs54 from "node:fs";
 import { homedir as homedir25 } from "node:os";
 import { parseArgs as parseArgs2 } from "node:util";
-var VERSION = "0.2.3";
+var VERSION = "0.2.5";
 var HELP_TOP = `Usage: halo <command> [options]
 
 Commands:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@turmind/halo",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Halo — multi-agent collaborative workspace. CLI + TUI + HTTP/WS server in one package.",
   "type": "module",
   "license": "MIT",