@signetai/connector-forge 0.154.6 → 0.154.7

package/dist/index.js

@@ -6,29 +6,32 @@ import {
   readFileSync as readFileSync2,
   readdirSync,
   readlinkSync,
-  rmSync,
+  rmSync as rmSync2,
   unlinkSync as unlinkSync3,
-  writeFileSync as writeFileSync2
+  writeFileSync as writeFileSync3
 } from "node:fs";
-import { homedir as homedir4 } from "node:os";
+import { homedir as homedir5 } from "node:os";
 import { isAbsolute, join as join6, relative, resolve as resolve2, sep } from "node:path";
 
 // ../../../libs/connector-base/dist/index.js
 import { randomBytes } from "node:crypto";
-import { existsSync, readFileSync, renameSync, statSync, unlinkSync as unlinkSync2, writeFileSync } from "node:fs";
+import { existsSync, readFileSync, renameSync, statSync as statSync2, unlinkSync as unlinkSync2, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
-import { dirname as dirname2, join as join3, resolve } from "node:path";
+import { dirname as dirname3, join as join3 } from "node:path";
 import { createRequire } from "node:module";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { homedir as homedir2 } from "os";
 import { join as join2 } from "path";
+import { existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync3, rmSync, statSync, writeFileSync as writeFileSync2 } from "node:fs";
+import { homedir as homedir3 } from "node:os";
+import { dirname as dirname2, join as join5, resolve } from "node:path";
 import { createRequire as createRequire2 } from "node:module";
-import { homedir as homedir3, platform as platform2 } from "node:os";
-import { basename, dirname as dirname3, resolve as resolve3 } from "node:path";
-import { homedir as homedir7 } from "node:os";
-import { existsSync as existsSync12, lstatSync, mkdirSync as mkdirSync8, readdirSync as readdirSync6, symlinkSync, unlinkSync } from "node:fs";
-import { join as join12 } from "node:path";
+import { homedir as homedir4, platform as platform2 } from "node:os";
+import { basename, dirname as dirname4, resolve as resolve4 } from "node:path";
+import { homedir as homedir8 } from "node:os";
+import { existsSync as existsSync13, lstatSync, mkdirSync as mkdirSync9, readdirSync as readdirSync6, symlinkSync, unlinkSync } from "node:fs";
+import { join as join13 } from "node:path";
 var __create2 = Object.create;
 var __getProtoOf2 = Object.getPrototypeOf;
 var __defProp2 = Object.defineProperty;
@@ -10714,6 +10717,109 @@ function expandHome(p, home = homedir2()) {
 }
 var LOCAL_BINDS = new Set(["127.0.0.1", "localhost", "::1", "::ffff:127.0.0.1"]);
 var import_yaml2 = __toESM2(require_dist(), 1);
+var WORKSPACE_ENV_KEYS = ["SIGNET_PATH", "SIGNET_WORKSPACE"];
+var DEFAULT_AGENTS_DIRNAME = ".agents";
+function normalizeWorkspacePath(pathValue, home = homedir3()) {
+  return resolve(expandHome(pathValue.trim(), home));
+}
+function readTrimmedEnv(env, name) {
+  const value = env[name];
+  if (typeof value !== "string")
+    return;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : undefined;
+}
+function readConfigHome(env, home) {
+  const raw = env.XDG_CONFIG_HOME;
+  if (typeof raw !== "string")
+    return join5(home, ".config");
+  const trimmed = raw.trim();
+  return trimmed.length > 0 ? normalizeWorkspacePath(trimmed, home) : join5(home, ".config");
+}
+function isExistingDirectory(path) {
+  try {
+    return statSync(path).isDirectory();
+  } catch {
+    return false;
+  }
+}
+function isRecord4(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function getWorkspaceConfigPath(env = process.env, home = homedir3()) {
+  return join5(readConfigHome(env, home), "signet", "workspace.json");
+}
+function readConfiguredWorkspacePath(env = process.env, home = homedir3(), options = {}) {
+  const strict = options.strict ?? false;
+  const configPath = getWorkspaceConfigPath(env, home);
+  if (!existsSync4(configPath))
+    return null;
+  let raw;
+  try {
+    raw = JSON.parse(readFileSync3(configPath, "utf-8"));
+  } catch (err) {
+    if (strict) {
+      const detail = err instanceof Error ? err.message : String(err);
+      throw new Error(`Invalid Signet workspace config at ${configPath}: ${detail}`);
+    }
+    return null;
+  }
+  if (!isRecord4(raw) || !("workspace" in raw)) {
+    if (strict)
+      throw new Error(`Invalid Signet workspace config at ${configPath}: missing workspace`);
+    return null;
+  }
+  const workspace = raw.workspace;
+  if (typeof workspace !== "string" || workspace.trim().length === 0) {
+    if (strict)
+      throw new Error(`Invalid Signet workspace config at ${configPath}: workspace must be a non-empty string`);
+    return null;
+  }
+  return normalizeWorkspacePath(workspace, home);
+}
+function resolveWorkspacePath(options = {}) {
+  const env = options.env ?? process.env;
+  const home = options.home ?? homedir3();
+  const strict = options.strict ?? false;
+  const requireExistingEnvPath = options.requireExistingEnvPath ?? false;
+  const configPath = getWorkspaceConfigPath(env, home);
+  const envPath = resolveEnvWorkspace(env, home, requireExistingEnvPath);
+  const configValue = readConfiguredWorkspacePath(env, home, { strict: envPath ? false : strict });
+  if (envPath) {
+    return {
+      path: envPath,
+      source: "env",
+      configPath,
+      configuredPath: configValue
+    };
+  }
+  if (configValue) {
+    return {
+      path: configValue,
+      source: "config",
+      configPath,
+      configuredPath: configValue
+    };
+  }
+  return {
+    path: join5(home, DEFAULT_AGENTS_DIRNAME),
+    source: "default",
+    configPath,
+    configuredPath: configValue
+  };
+}
+function resolveEnvWorkspace(env, home, requireExisting) {
+  for (const key of WORKSPACE_ENV_KEYS) {
+    const raw = readTrimmedEnv(env, key);
+    if (!raw)
+      continue;
+    const normalized = normalizeWorkspacePath(raw, home);
+    if (!requireExisting || isExistingDirectory(normalized))
+      return normalized;
+    console.warn(`[signet] ${key}="${raw}" does not point to an existing workspace directory; using the default workspace resolution instead.`);
+  }
+  return null;
+}
 var native = null;
 try {
   const esmRequire = createRequire2(import.meta.url);
@@ -10788,11 +10894,11 @@ var VALID_GITHUB_RESOURCE_TYPES = new Set(DEFAULT_GITHUB_RESOURCE_TYPES);
 function defaultDiscordDesktopCachePath() {
   switch (platform2()) {
     case "darwin":
-      return resolve3(homedir3(), "Library", "Application Support", "discord");
+      return resolve4(homedir4(), "Library", "Application Support", "discord");
     case "win32":
-      return resolve3(process.env.APPDATA || resolve3(homedir3(), "AppData", "Roaming"), "discord");
+      return resolve4(process.env.APPDATA || resolve4(homedir4(), "AppData", "Roaming"), "discord");
     default:
-      return resolve3(process.env.XDG_CONFIG_HOME || resolve3(homedir3(), ".config"), "discord");
+      return resolve4(process.env.XDG_CONFIG_HOME || resolve4(homedir4(), ".config"), "discord");
   }
 }
 var IDENTITY_FILES = {
@@ -10860,15 +10966,15 @@ function symlinkSkills(sourceDir, targetDir, options = {}) {
     skipped: [],
     errors: []
   };
-  if (!existsSync12(sourceDir)) {
+  if (!existsSync13(sourceDir)) {
     return result;
   }
-  const targetParent = join12(targetDir, "..");
-  if (!existsSync12(targetParent)) {
-    mkdirSync8(targetParent, { recursive: true });
+  const targetParent = join13(targetDir, "..");
+  if (!existsSync13(targetParent)) {
+    mkdirSync9(targetParent, { recursive: true });
   }
-  if (!existsSync12(targetDir)) {
-    mkdirSync8(targetDir, { recursive: true });
+  if (!existsSync13(targetDir)) {
+    mkdirSync9(targetDir, { recursive: true });
   }
   let entries;
   try {
@@ -10881,8 +10987,8 @@ function symlinkSkills(sourceDir, targetDir, options = {}) {
     return result;
   }
   for (const entry of entries) {
-    const srcPath = join12(sourceDir, entry);
-    const destPath = join12(targetDir, entry);
+    const srcPath = join13(sourceDir, entry);
+    const destPath = join13(targetDir, entry);
     try {
       const src = lstatSync(srcPath);
       if (src.isSymbolicLink() || !src.isDirectory()) {
@@ -10923,7 +11029,7 @@ function symlinkSkills(sourceDir, targetDir, options = {}) {
   }
   return result;
 }
-var home = homedir7();
+var home = homedir8();
 var SIGNET_BLOCK_START = "<!-- SIGNET:START -->";
 var SIGNET_BLOCK_END = "<!-- SIGNET:END -->";
 function stripSignetBlock(content) {
@@ -11080,7 +11186,7 @@ class BaseConnector {
   generateHeader(sourcePath, targetName) {
     const name = targetName || this.name;
     const safe = (p) => p.replace(/[\n\r]/g, "");
-    const root = dirname2(sourcePath);
+    const root = dirname3(sourcePath);
     return `# Auto-generated from ${safe(sourcePath)}
 # Source: ${safe(sourcePath)}
 # Generated: ${new Date().toISOString()}
@@ -11117,11 +11223,11 @@ function isSignetGeneratedFile(raw) {
   return lines.some((line, i) => /^#\s+AUTO-GENERATED\s+from\s+.*\s+by\s+Signet/i.test(line) || /^#\s+Auto-generated\s+from\s+/.test(line) && i + 1 < lines.length && /^#\s+Source:\s+/.test(lines[i + 1]));
 }
 function atomicWriteText(path, content, mode) {
-  const tmp = join3(dirname2(path), `.${randomBytes(6).toString("hex")}.tmp`);
+  const tmp = join3(dirname3(path), `.${randomBytes(6).toString("hex")}.tmp`);
   let writeMode = mode;
   if (writeMode === undefined) {
     try {
-      writeMode = statSync(path).mode & 511;
+      writeMode = statSync2(path).mode & 511;
     } catch {}
   }
   try {
@@ -11160,41 +11266,8 @@ function readManagedTrimmedEnv(name) {
   const trimmed = value.trim();
   return trimmed.length > 0 ? trimmed : undefined;
 }
-function isExistingDirectory(path) {
-  try {
-    return statSync(path).isDirectory();
-  } catch {
-    return false;
-  }
-}
 function resolveSignetWorkspacePath(home2 = homedir()) {
-  const configured = readManagedTrimmedEnv("SIGNET_PATH");
-  if (configured) {
-    const resolved = resolve(expandHome(configured));
-    if (isExistingDirectory(resolved))
-      return resolved;
-    console.warn(`[signet] SIGNET_PATH="${configured}" does not point to an existing workspace directory; using the default workspace resolution instead.`);
-  }
-  const defaultWorkspace = join3(home2, ".agents");
-  const configHome = readManagedTrimmedEnv("XDG_CONFIG_HOME") ?? join3(home2, ".config");
-  const workspaceConfigPath = join3(configHome, "signet", "workspace.json");
-  if (!existsSync(workspaceConfigPath))
-    return defaultWorkspace;
-  let raw;
-  try {
-    raw = JSON.parse(readFileSync(workspaceConfigPath, "utf8"));
-  } catch (err) {
-    const detail = err instanceof Error ? err.message : String(err);
-    throw new Error(`Invalid Signet workspace config at ${workspaceConfigPath}: ${detail}`);
-  }
-  if (typeof raw !== "object" || raw === null || !("workspace" in raw)) {
-    throw new Error(`Invalid Signet workspace config at ${workspaceConfigPath}: missing workspace`);
-  }
-  const workspace = raw.workspace;
-  if (typeof workspace !== "string" || workspace.trim().length === 0) {
-    throw new Error(`Invalid Signet workspace config at ${workspaceConfigPath}: workspace must be a non-empty string`);
-  }
-  return resolve(expandHome(workspace.trim()));
+  return resolveWorkspacePath({ home: home2, strict: true, requireExistingEnvPath: true }).path;
 }
 function resolveSignetApiKey() {
   return readManagedTrimmedEnv("SIGNET_API_KEY") ?? readManagedTrimmedEnv("SIGNET_TOKEN");
@@ -11202,16 +11275,16 @@ function resolveSignetApiKey() {
 
 // ../../../platform/core/dist/index.js
 import { createRequire as createRequire3 } from "node:module";
-import { dirname as dirname4, join as join4 } from "node:path";
+import { dirname as dirname5, join as join4 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 import { homedir as homedir22 } from "os";
 import { join as join22 } from "path";
 import { createRequire as createRequire22 } from "node:module";
-import { homedir as homedir32, platform as platform22 } from "node:os";
-import { basename as basename2, dirname as dirname32, resolve as resolve32 } from "node:path";
-import { existsSync as existsSync10, readFileSync as readFileSync8, readdirSync as readdirSync4, realpathSync, statSync as statSync4 } from "node:fs";
-import { dirname as dirname6, join as join10 } from "node:path";
-import { homedir as homedir72 } from "node:os";
+import { homedir as homedir42, platform as platform22 } from "node:os";
+import { basename as basename2, dirname as dirname42, resolve as resolve42 } from "node:path";
+import { existsSync as existsSync11, readFileSync as readFileSync9, readdirSync as readdirSync4, realpathSync, statSync as statSync5 } from "node:fs";
+import { dirname as dirname7, join as join11 } from "node:path";
+import { homedir as homedir82 } from "node:os";
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
@@ -21886,7 +21959,7 @@ var MIGRATIONS2 = [
 ];
 var LATEST_SCHEMA_VERSION2 = MIGRATIONS2[MIGRATIONS2.length - 1]?.version ?? 0;
 var __filename22 = fileURLToPath2(import.meta.url);
-var __dirname22 = dirname4(__filename22);
+var __dirname22 = dirname5(__filename22);
 var import_yaml3 = __toESM(require_dist2(), 1);
 function expandHome2(p, home2 = homedir22()) {
   if (p === "~")
@@ -22050,11 +22123,11 @@ var VALID_GITHUB_RESOURCE_TYPES2 = new Set(DEFAULT_GITHUB_RESOURCE_TYPES2);
 function defaultDiscordDesktopCachePath2() {
   switch (platform22()) {
     case "darwin":
-      return resolve32(homedir32(), "Library", "Application Support", "discord");
+      return resolve42(homedir42(), "Library", "Application Support", "discord");
     case "win32":
-      return resolve32(process.env.APPDATA || resolve32(homedir32(), "AppData", "Roaming"), "discord");
+      return resolve42(process.env.APPDATA || resolve42(homedir42(), "AppData", "Roaming"), "discord");
     default:
-      return resolve32(process.env.XDG_CONFIG_HOME || resolve32(homedir32(), ".config"), "discord");
+      return resolve42(process.env.XDG_CONFIG_HOME || resolve42(homedir42(), ".config"), "discord");
   }
 }
 var IDENTITY_MODES = ["managed", "passthrough", "off"];
@@ -22119,7 +22192,7 @@ function hasValidIdentity(basePath) {
     return true;
   for (const key of REQUIRED_IDENTITY_KEYS2) {
     const spec = IDENTITY_FILES2[key];
-    if (!existsSync10(join10(basePath, spec.path))) {
+    if (!existsSync11(join11(basePath, spec.path))) {
       return false;
     }
   }
@@ -22145,16 +22218,16 @@ function resolveIdentityModeFromConfig(config) {
   return "managed";
 }
 function loadIdentityMode(agentsDir) {
-  const agentYaml = join10(agentsDir, "agent.yaml");
-  if (!existsSync10(agentYaml))
+  const agentYaml = join11(agentsDir, "agent.yaml");
+  if (!existsSync11(agentYaml))
     return "managed";
   try {
-    return resolveIdentityModeFromConfig(parseSimpleYaml(readFileSync8(agentYaml, "utf-8")));
+    return resolveIdentityModeFromConfig(parseSimpleYaml(readFileSync9(agentYaml, "utf-8")));
   } catch {
     return "managed";
   }
 }
-var home2 = homedir72();
+var home2 = homedir82();
 var SKIP_SUBTYPES2 = new Set([
   "channel_join",
   "channel_leave",
@@ -22277,7 +22350,7 @@ var SIGNET_FORGE_MARKER = "Managed by Signet (@signetai/connector-forge)";
 function isJsonObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function readTrimmedEnv(name) {
+function readTrimmedEnv2(name) {
   const value = process.env[name];
   if (typeof value !== "string")
     return;
@@ -22285,8 +22358,8 @@ function readTrimmedEnv(name) {
   return trimmed.length > 0 ? trimmed : undefined;
 }
 function getHomeDir() {
-  const home3 = readTrimmedEnv("HOME");
-  return home3 ?? homedir4();
+  const home3 = readTrimmedEnv2("HOME");
+  return home3 ?? homedir5();
 }
 function readJsonObject(path) {
   if (!existsSync2(path))
@@ -22306,9 +22379,9 @@ function readMcpServers(config) {
 }
 function signetRuntimeEnv(basePath) {
   const env = { SIGNET_PATH: basePath };
-  const daemonUrl = readTrimmedEnv("SIGNET_DAEMON_URL");
-  const apiKey = readTrimmedEnv("SIGNET_API_KEY") ?? readTrimmedEnv("SIGNET_TOKEN");
-  const agentId = readTrimmedEnv("SIGNET_AGENT_ID");
+  const daemonUrl = readTrimmedEnv2("SIGNET_DAEMON_URL");
+  const apiKey = readTrimmedEnv2("SIGNET_API_KEY") ?? readTrimmedEnv2("SIGNET_TOKEN");
+  const agentId = readTrimmedEnv2("SIGNET_AGENT_ID");
   if (daemonUrl)
     env.SIGNET_DAEMON_URL = daemonUrl;
   if (apiKey)
@@ -22318,7 +22391,7 @@ function signetRuntimeEnv(basePath) {
   return env;
 }
 function resolveRemoteDaemonUrl() {
-  return readTrimmedEnv("SIGNET_DAEMON_URL") ? resolveSignetDaemonUrl() : null;
+  return readTrimmedEnv2("SIGNET_DAEMON_URL") ? resolveSignetDaemonUrl() : null;
 }
 function buildMcpServer(basePath) {
   const remoteDaemonUrl = resolveRemoteDaemonUrl();
@@ -22345,7 +22418,7 @@ class ForgeConnector extends BaseConnector {
   name = "ForgeCode";
   harnessId = "forge";
   getForgeHome() {
-    const configured = readTrimmedEnv("FORGE_CONFIG");
+    const configured = readTrimmedEnv2("FORGE_CONFIG");
     if (configured)
       return resolve2(expandHome2(configured));
     const legacyPath = join6(getHomeDir(), "forge");
@@ -22396,7 +22469,7 @@ class ForgeConnector extends BaseConnector {
         try {
           const raw = readFileSync2(staleAgentsPath, "utf-8");
           if (isSignetGeneratedFile(raw) || raw.includes(SIGNET_FORGE_MARKER))
-            rmSync(staleAgentsPath);
+            rmSync2(staleAgentsPath);
         } catch {}
       }
     }
@@ -22432,7 +22505,7 @@ class ForgeConnector extends BaseConnector {
       try {
         const raw = readFileSync2(agentsPath, "utf-8");
         if (isSignetGeneratedFile(raw) || raw.includes(SIGNET_FORGE_MARKER)) {
-          rmSync(agentsPath, { force: true });
+          rmSync2(agentsPath, { force: true });
           filesRemoved.push(agentsPath);
         }
       } catch {}
@@ -22452,7 +22525,7 @@ class ForgeConnector extends BaseConnector {
         const patched = this.removeMcpServer(config);
         if (patched) {
           if (Object.keys(config).length === 0) {
-            rmSync(this.getMcpConfigPath(), { force: true });
+            rmSync2(this.getMcpConfigPath(), { force: true });
             filesRemoved.push(this.getMcpConfigPath());
           } else {
             atomicWriteJson(this.getMcpConfigPath(), config);
@@ -22473,7 +22546,7 @@ class ForgeConnector extends BaseConnector {
   }
   static isHarnessInstalled() {
     const home3 = getHomeDir();
-    return existsSync2(readTrimmedEnv("FORGE_CONFIG") ?? "") || existsSync2(join6(home3, "forge", ".mcp.json")) || existsSync2(join6(home3, ".forge", ".mcp.json")) || existsSync2(join6(home3, "forge")) || existsSync2(join6(home3, ".forge"));
+    return existsSync2(readTrimmedEnv2("FORGE_CONFIG") ?? "") || existsSync2(join6(home3, "forge", ".mcp.json")) || existsSync2(join6(home3, ".forge", ".mcp.json")) || existsSync2(join6(home3, "forge")) || existsSync2(join6(home3, ".forge"));
   }
   getAgentsPath() {
     return join6(this.getForgeHome(), "AGENTS.md");
@@ -22494,7 +22567,7 @@ class ForgeConnector extends BaseConnector {
     const body = extras ? `${userContent}${extras}` : userContent;
     const header = this.generateHeader(sourcePath, this.name);
     const targetPath = this.getAgentsPath();
-    writeFileSync2(targetPath, `# ${SIGNET_FORGE_MARKER}
+    writeFileSync3(targetPath, `# ${SIGNET_FORGE_MARKER}
 ${header}${body}
 `, "utf-8");
     return targetPath;
@@ -22555,7 +22628,7 @@ ${header}${body}
     }
     try {
       if (readdirSync(skillsDir).length === 0)
-        rmSync(skillsDir, { recursive: true, force: true });
+        rmSync2(skillsDir, { recursive: true, force: true });
     } catch {}
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signetai/connector-forge",
-  "version": "0.154.6",
+  "version": "0.154.7",
   "description": "Signet connector for ForgeCode - installs MCP, identity, and skills integration",
   "type": "module",
   "main": "./dist/index.js",
@@ -24,8 +24,8 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@signetai/connector-base": "0.154.6",
-    "@signetai/core": "0.154.6"
+    "@signetai/connector-base": "0.154.7",
+    "@signetai/core": "0.154.7"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",