abelworkflow 0.1.1 → 0.2.0

package/lib/cli.mjs

@@ -16,6 +16,54 @@ const claudeVscodeConfigPath = join(home, ".claude", "config.json");
 const claudeMetaConfigPath = join(home, ".claude.json");
 const codexConfigPath = join(home, ".codex", "config.toml");
 const codexAuthPath = join(home, ".codex", "auth.json");
+const claudeModelEnvKeys = [
+  "ANTHROPIC_MODEL",
+  "ANTHROPIC_DEFAULT_OPUS_MODEL",
+  "ANTHROPIC_DEFAULT_SONNET_MODEL",
+  "ANTHROPIC_DEFAULT_HAIKU_MODEL",
+  "CLAUDE_CODE_SUBAGENT_MODEL"
+];
+const defaultClaudeSettings = {
+  $schema: "https://json.schemastore.org/claude-code-settings.json",
+  env: {
+    DISABLE_TELEMETRY: "1",
+    DISABLE_ERROR_REPORTING: "1",
+    CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: "1",
+    ANTHROPIC_BASE_URL: "",
+    ANTHROPIC_API_KEY: "",
+    ANTHROPIC_MODEL: "",
+    ANTHROPIC_DEFAULT_OPUS_MODEL: "",
+    ANTHROPIC_DEFAULT_SONNET_MODEL: "",
+    ANTHROPIC_DEFAULT_HAIKU_MODEL: "",
+    CLAUDE_CODE_SUBAGENT_MODEL: "",
+    API_TIMEOUT_MS: "1000000"
+  },
+  includeCoAuthoredBy: false,
+  permissions: {
+    allow: [
+      "Bash",
+      "Skill",
+      "LS",
+      "Read",
+      "Agent",
+      "Write",
+      "Edit",
+      "MultiEdit",
+      "Glob",
+      "Grep",
+      "WebFetch",
+      "WebSearch",
+      "TodoWrite",
+      "NotebookRead",
+      "NotebookEdit",
+      "mcp__augment-context-engine"
+    ],
+    deny: []
+  },
+  hooks: {},
+  alwaysThinkingEnabled: true,
+  language: "Chinese"
+};
 const managedEntries = [
   { target: "AGENTS.md" },
   { target: "README.md" },
@@ -1143,12 +1191,33 @@ async function configurePromptEnhancerEnv(agentsDir) {
   console.log(`已写入 ${pathToLabel(envPath)}`);
 }
 
+function mergeClaudeSettingsWithDefaults(settings) {
+  const env = settings?.env && typeof settings.env === "object" ? settings.env : {};
+  const permissions = settings?.permissions && typeof settings.permissions === "object" ? settings.permissions : {};
+  return {
+    ...defaultClaudeSettings,
+    ...settings,
+    env: {
+      ...defaultClaudeSettings.env,
+      ...env
+    },
+    permissions: {
+      ...defaultClaudeSettings.permissions,
+      ...permissions,
+      allow: Array.isArray(permissions.allow) ? permissions.allow : defaultClaudeSettings.permissions.allow,
+      deny: Array.isArray(permissions.deny) ? permissions.deny : defaultClaudeSettings.permissions.deny
+    },
+    hooks: settings?.hooks && typeof settings.hooks === "object" ? settings.hooks : defaultClaudeSettings.hooks
+  };
+}
+
 function getExistingClaudeApiConfig(settings) {
-  const env = settings?.env || {};
+  const env = mergeClaudeSettingsWithDefaults(settings).env;
   return {
     baseUrl: env.ANTHROPIC_BASE_URL || "https://api.anthropic.com",
     authType: env.ANTHROPIC_AUTH_TOKEN ? "auth_token" : "api_key",
-    key: env.ANTHROPIC_AUTH_TOKEN || env.ANTHROPIC_API_KEY || ""
+    key: env.ANTHROPIC_AUTH_TOKEN || env.ANTHROPIC_API_KEY || "",
+    model: claudeModelEnvKeys.map((field) => env[field]).find(Boolean) || ""
   };
 }
 
@@ -1189,14 +1258,12 @@ async function configureClaudeApi() {
   const key = await promptSecret(authType === "auth_token" ? "Claude Code Auth Token" : "Claude Code API Key", {
     defaultValue: existing.key || undefined
   });
+  const model = await promptText("Claude Code 模型", {
+    defaultValue: existing.model || undefined
+  });
 
-  const nextSettings = {
-    ...settings,
-    env: {
-      ...(settings.env || {}),
-      ANTHROPIC_BASE_URL: baseUrl
-    }
-  };
+  const nextSettings = mergeClaudeSettingsWithDefaults(settings);
+  nextSettings.env.ANTHROPIC_BASE_URL = baseUrl;
 
   if (authType === "auth_token") {
     nextSettings.env.ANTHROPIC_AUTH_TOKEN = key;
@@ -1205,6 +1272,9 @@ async function configureClaudeApi() {
     nextSettings.env.ANTHROPIC_API_KEY = key;
     delete nextSettings.env.ANTHROPIC_AUTH_TOKEN;
   }
+  for (const field of claudeModelEnvKeys) {
+    nextSettings.env[field] = model;
+  }
 
   await writeJsonFileSafe(claudeSettingsPath, nextSettings);
 
@@ -1324,14 +1394,12 @@ async function getExistingCodexApiConfig() {
   const content = await pathExists(codexConfigPath) ? await readFile(codexConfigPath, "utf8") : "";
   const auth = await readJsonFileSafe(codexAuthPath, {});
   const providerId = readTopLevelTomlString(content, "model_provider") || "abelworkflow";
-  const model = readTopLevelTomlString(content, "model") || "gpt-5.2";
   const provider = parseTomlSection(content, `model_providers.${providerId}`);
   const envKey = provider.temp_env_key || "OPENAI_API_KEY";
   return {
     providerId,
-    providerName: provider.name || providerId,
+    providerName: provider.name || (providerId === "abelworkflow" ? "AbelWorkflow" : providerId),
     baseUrl: provider.base_url || "https://api.openai.com/v1",
-    model: provider.model || model,
     envKey,
     apiKey: auth[envKey] || ""
   };
@@ -1339,16 +1407,11 @@ async function getExistingCodexApiConfig() {
 
 async function configureCodexApi() {
   const existing = await getExistingCodexApiConfig();
-  const providerName = await promptText("Codex Provider 名称", {
-    defaultValue: existing.providerName || "AbelWorkflow"
-  });
-  const providerId = sanitizeProviderId(providerName);
+  const providerId = existing.providerId || "abelworkflow";
+  const providerName = existing.providerName || "AbelWorkflow";
   const baseUrl = await promptText("Codex Base URL", {
     defaultValue: existing.baseUrl
   });
-  const model = await promptText("Codex 默认模型", {
-    defaultValue: existing.model || "gpt-5.2"
-  });
   const apiKey = await promptSecret("Codex 第三方 API Key", {
     defaultValue: existing.apiKey || undefined
   });
@@ -1356,7 +1419,6 @@ async function configureCodexApi() {
 
   let content = await pathExists(codexConfigPath) ? await readFile(codexConfigPath, "utf8") : "";
   const lineEnding = detectLineEnding(content);
-  content = updateTopLevelTomlField(content, "model", model);
   content = updateTopLevelTomlField(content, "model_provider", providerId);
   content = removeTomlSection(content, `model_providers.${providerId}`);
   content = `${content.trimEnd() ? `${content.trimEnd()}${lineEnding}${lineEnding}` : ""}${buildTomlSection(`model_providers.${providerId}`, {
@@ -1364,8 +1426,7 @@ async function configureCodexApi() {
     base_url: baseUrl,
     wire_api: "responses",
     temp_env_key: envKey,
-    requires_openai_auth: true,
-    model
+    requires_openai_auth: true
   }, lineEnding)}`;
 
   await mkdir(dirname(codexConfigPath), { recursive: true });
@@ -1375,7 +1436,7 @@ async function configureCodexApi() {
   auth[envKey] = apiKey;
   await writeJsonFileSafe(codexAuthPath, auth);
 
-  console.log(`已更新 ${pathToLabel(codexConfigPath)} (${providerId}, ${baseUrl}, ${model})`);
+  console.log(`已更新 ${pathToLabel(codexConfigPath)} (${providerId}, ${baseUrl})`);
   console.log(`已更新 ${pathToLabel(codexAuthPath)} (${maskSecret(apiKey)})`);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abelworkflow",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Install AbelWorkflow into ~/.agents and create Claude/Codex symlinks.",
   "type": "module",
   "bin": {