geo-ai-search-optimization 1.3.8 → 1.3.10

package/README.md

@@ -894,6 +894,21 @@ geo-ai-search-optimization help
 - `src/cli-site-ops-commands.js` 现在统一通过组合器编排 `doctor / quick-start / onboard / onboard-url / audit / scan`
 - CLI 架构进一步收敛到“命令族 adapter + shared composition primitives”的模式
 
+## New in 1.3.9
+
+- 继续把“直接执行型命令”也纳入共享组合模式
+- `src/cli-shared.js` 新增 `createActionCommandHandler`
+- `src/cli-shell-commands.js` 里的 `install` 已改成声明式 action 组合
+- `src/cli-site-ops-commands.js` 里的 `init-llms / init-schema` 已改成声明式 action 组合
+- CLI 现在同时覆盖 artifact、structured-output、action 三类共享 composition primitives
+
+## New in 1.3.10
+
+- 开始把重复的命令参数组装抽成共享 option builders
+- `src/cli-shared.js` 新增 `buildIntentFormatOptions / buildTaskFormatOptions / buildProgressFormatOptions` 等 builder
+- `src/cli-agent-execution-commands.js`、`src/cli-flow-commands.js`、`src/cli-planning-delivery-commands.js` 现在统一复用这些 builder
+- CLI 架构进一步接近“adapter registry + shared option builders + shared composition primitives”的模式
+
 ## New in 1.2.20
 
 - 新增 `agent-continue`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geo-ai-search-optimization",
-  "version": "1.3.8",
+  "version": "1.3.10",
   "description": "Install and run a Generative Engine Optimization (GEO)-first, SEO-supported Codex skill for website optimization.",
   "type": "module",
   "bin": {

package/src/cli-agent-execution-commands.js

@@ -20,9 +20,12 @@ import { createAgentRetrospective, renderAgentRetrospectiveMarkdown, writeAgentR
 import { createAgentStatusBoard, renderAgentStatusBoardMarkdown, writeAgentStatusBoardOutput } from "./agent-status-board.js";
 import { createAgentRunbook, renderAgentRunbookMarkdown, writeAgentRunbookOutput } from "./agent-runbook.js";
 import {
+  buildIntentTaskFormatOptions,
+  buildJsonCapableFormatOptions,
+  buildProgressFormatOptions,
+  buildTaskOptions,
   createArtifactCommandHandler,
-  getFlagValue,
-  getJsonCapableFormat
+  getFlagValue
 } from "./cli-shared.js";
 
 export const AGENT_EXECUTION_HELP_LINES = [
@@ -43,11 +46,7 @@ const handleAgentRunbook = createArtifactCommandHandler({
   createArtifact: createAgentRunbook,
   renderMarkdown: renderAgentRunbookMarkdown,
   writeOutput: writeAgentRunbookOutput,
-  getOptions: (args) => ({
-    intent: getFlagValue(args, "--intent"),
-    format: getFlagValue(args, "--format"),
-    taskId: getFlagValue(args, "--task")
-  })
+  getOptions: buildIntentTaskFormatOptions
 });
 
 const handleAgentExecutor = createArtifactCommandHandler({
@@ -56,11 +55,7 @@ const handleAgentExecutor = createArtifactCommandHandler({
   createArtifact: createAgentExecutor,
   renderMarkdown: renderAgentExecutorMarkdown,
   writeOutput: writeAgentExecutorOutput,
-  getOptions: (args) => ({
-    intent: getFlagValue(args, "--intent"),
-    format: getFlagValue(args, "--format"),
-    taskId: getFlagValue(args, "--task")
-  })
+  getOptions: buildIntentTaskFormatOptions
 });
 
 const handleAgentBatchExecutor = createArtifactCommandHandler({
@@ -70,9 +65,7 @@ const handleAgentBatchExecutor = createArtifactCommandHandler({
   renderMarkdown: renderAgentBatchExecutorMarkdown,
   writeOutput: writeAgentBatchExecutorOutput,
   getOptions: (args) => ({
-    intent: getFlagValue(args, "--intent"),
-    format: getJsonCapableFormat(args),
-    taskId: getFlagValue(args, "--task"),
+    ...buildIntentTaskFormatOptions(args),
     count: getFlagValue(args, "--count")
   })
 });
@@ -83,12 +76,7 @@ const handleAgentProgressTracker = createArtifactCommandHandler({
   createArtifact: createAgentProgressTracker,
   renderMarkdown: renderAgentProgressTrackerMarkdown,
   writeOutput: writeAgentProgressTrackerOutput,
-  getOptions: (args) => ({
-    format: getJsonCapableFormat(args),
-    currentTaskId: getFlagValue(args, "--current"),
-    completedPacketIds: getFlagValue(args, "--completed"),
-    blockedReasons: getFlagValue(args, "--blocked")
-  })
+  getOptions: buildProgressFormatOptions
 });
 
 const handleAgentStatusBoard = createArtifactCommandHandler({
@@ -97,12 +85,7 @@ const handleAgentStatusBoard = createArtifactCommandHandler({
   createArtifact: createAgentStatusBoard,
   renderMarkdown: renderAgentStatusBoardMarkdown,
   writeOutput: writeAgentStatusBoardOutput,
-  getOptions: (args) => ({
-    format: getJsonCapableFormat(args),
-    currentTaskId: getFlagValue(args, "--current"),
-    completedPacketIds: getFlagValue(args, "--completed"),
-    blockedReasons: getFlagValue(args, "--blocked")
-  })
+  getOptions: buildProgressFormatOptions
 });
 
 const handleAgentCheckpoint = createArtifactCommandHandler({
@@ -111,12 +94,7 @@ const handleAgentCheckpoint = createArtifactCommandHandler({
   createArtifact: createAgentCheckpoint,
   renderMarkdown: renderAgentCheckpointMarkdown,
   writeOutput: writeAgentCheckpointOutput,
-  getOptions: (args) => ({
-    format: getJsonCapableFormat(args),
-    currentTaskId: getFlagValue(args, "--current"),
-    completedPacketIds: getFlagValue(args, "--completed"),
-    blockedReasons: getFlagValue(args, "--blocked")
-  })
+  getOptions: buildProgressFormatOptions
 });
 
 const handleAgentDecisionLog = createArtifactCommandHandler({
@@ -126,12 +104,9 @@ const handleAgentDecisionLog = createArtifactCommandHandler({
   renderMarkdown: renderAgentDecisionLogMarkdown,
   writeOutput: writeAgentDecisionLogOutput,
   getOptions: (args) => ({
-    format: getJsonCapableFormat(args),
+    ...buildProgressFormatOptions(args),
     appendFrom: getFlagValue(args, "--append-from"),
-    note: getFlagValue(args, "--note"),
-    currentTaskId: getFlagValue(args, "--current"),
-    completedPacketIds: getFlagValue(args, "--completed"),
-    blockedReasons: getFlagValue(args, "--blocked")
+    note: getFlagValue(args, "--note")
   })
 });
 
@@ -141,9 +116,7 @@ const handleAgentRetrospective = createArtifactCommandHandler({
   createArtifact: createAgentRetrospective,
   renderMarkdown: renderAgentRetrospectiveMarkdown,
   writeOutput: writeAgentRetrospectiveOutput,
-  getOptions: (args) => ({
-    format: getJsonCapableFormat(args)
-  })
+  getOptions: buildJsonCapableFormatOptions
 });
 
 const handleAgentPlaybookPack = createArtifactCommandHandler({
@@ -153,8 +126,8 @@ const handleAgentPlaybookPack = createArtifactCommandHandler({
   renderMarkdown: renderAgentPlaybookPackMarkdown,
   writeOutput: writeAgentPlaybookPackOutput,
   getOptions: (args) => ({
-    format: getJsonCapableFormat(args),
-    taskId: getFlagValue(args, "--task")
+    ...buildJsonCapableFormatOptions(args),
+    ...buildTaskOptions(args)
   })
 });
 

package/src/cli-flow-commands.js

@@ -17,10 +17,11 @@ import {
 } from "./agent-state-pack.js";
 import { createAgentSession, renderAgentSessionMarkdown, writeAgentSessionOutput } from "./agent-session.js";
 import {
+  buildIntentFormatOptions,
+  buildIntentProgressFormatOptions,
   createArtifactCommandHandler,
   createStructuredOutputCommandHandler,
   getFlagValue,
-  getJsonCapableFormat,
   getRequiredInput,
   hasFlag
 } from "./cli-shared.js";
@@ -53,10 +54,7 @@ const handleAgentOrchestrator = createArtifactCommandHandler({
   createArtifact: createAgentOrchestrator,
   renderMarkdown: renderAgentOrchestratorMarkdown,
   writeOutput: writeAgentOrchestratorOutput,
-  getOptions: (args) => ({
-    intent: getFlagValue(args, "--intent"),
-    format: getJsonCapableFormat(args)
-  })
+  getOptions: buildIntentFormatOptions
 });
 
 const handleAgentResume = createArtifactCommandHandler({
@@ -65,10 +63,7 @@ const handleAgentResume = createArtifactCommandHandler({
   createArtifact: createAgentResume,
   renderMarkdown: renderAgentResumeMarkdown,
   writeOutput: writeAgentResumeOutput,
-  getOptions: (args) => ({
-    intent: getFlagValue(args, "--intent"),
-    format: getJsonCapableFormat(args)
-  })
+  getOptions: buildIntentFormatOptions
 });
 
 const handleAgentContinue = createArtifactCommandHandler({
@@ -77,10 +72,7 @@ const handleAgentContinue = createArtifactCommandHandler({
   createArtifact: createAgentContinue,
   renderMarkdown: renderAgentContinueMarkdown,
   writeOutput: writeAgentContinueOutput,
-  getOptions: (args) => ({
-    intent: getFlagValue(args, "--intent"),
-    format: getJsonCapableFormat(args)
-  })
+  getOptions: buildIntentFormatOptions
 });
 
 const handleAgentStatePack = createArtifactCommandHandler({
@@ -89,13 +81,7 @@ const handleAgentStatePack = createArtifactCommandHandler({
   createArtifact: createAgentStatePack,
   renderMarkdown: renderAgentStatePackMarkdown,
   writeOutput: writeAgentStatePackOutput,
-  getOptions: (args) => ({
-    intent: getFlagValue(args, "--intent"),
-    format: getJsonCapableFormat(args),
-    currentTaskId: getFlagValue(args, "--current"),
-    completedPacketIds: getFlagValue(args, "--completed"),
-    blockedReasons: getFlagValue(args, "--blocked")
-  })
+  getOptions: buildIntentProgressFormatOptions
 });
 
 const handleAgentSession = createArtifactCommandHandler({
@@ -105,7 +91,8 @@ const handleAgentSession = createArtifactCommandHandler({
   renderMarkdown: renderAgentSessionMarkdown,
   writeOutput: writeAgentSessionOutput,
   getOptions: (args) => ({
-    intent: getFlagValue(args, "--intent")
+    ...buildIntentFormatOptions(args),
+    format: undefined
   })
 });
 

package/src/cli-planning-delivery-commands.js

@@ -18,6 +18,8 @@ import { generateReport, writeReportOutput } from "./report.js";
 import { createRoadmap, renderRoadmapMarkdown, writeRoadmapOutput } from "./roadmap.js";
 import { createSharePack, renderSharePackMarkdown, writeSharePackOutput } from "./share-pack.js";
 import {
+  buildFormatOptions,
+  buildTaskFormatOptions,
   createArtifactCommandHandler,
   createPackCommandHandler,
   getFlagValue,
@@ -49,9 +51,7 @@ const handleAgentHandoff = createArtifactCommandHandler({
   createArtifact: createAgentHandoff,
   renderMarkdown: renderAgentHandoffMarkdown,
   writeOutput: writeAgentHandoffOutput,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format")
-  })
+  getOptions: buildFormatOptions
 });
 
 const handleApplyPlan = createArtifactCommandHandler({
@@ -60,10 +60,7 @@ const handleApplyPlan = createArtifactCommandHandler({
   createArtifact: createApplyPlan,
   renderMarkdown: renderApplyPlanMarkdown,
   writeOutput: writeApplyPlanOutput,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format"),
-    taskId: getFlagValue(args, "--task")
-  })
+  getOptions: buildTaskFormatOptions
 });
 
 const handleCompletionReport = createArtifactCommandHandler({
@@ -72,9 +69,7 @@ const handleCompletionReport = createArtifactCommandHandler({
   createArtifact: createCompletionReport,
   renderMarkdown: renderCompletionReportMarkdown,
   writeOutput: writeCompletionReportOutput,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format")
-  })
+  getOptions: buildFormatOptions
 });
 
 const handleHandoffBundle = createArtifactCommandHandler({
@@ -83,10 +78,7 @@ const handleHandoffBundle = createArtifactCommandHandler({
   createArtifact: createHandoffBundle,
   renderMarkdown: renderHandoffBundleMarkdown,
   writeOutput: writeHandoffBundleOutput,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format"),
-    taskId: getFlagValue(args, "--task")
-  })
+  getOptions: buildTaskFormatOptions
 });
 
 const handleSharePack = createArtifactCommandHandler({
@@ -95,10 +87,7 @@ const handleSharePack = createArtifactCommandHandler({
   createArtifact: createSharePack,
   renderMarkdown: renderSharePackMarkdown,
   writeOutput: writeSharePackOutput,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format"),
-    taskId: getFlagValue(args, "--task")
-  })
+  getOptions: buildTaskFormatOptions
 });
 
 const handleExportPack = createPackCommandHandler({
@@ -138,9 +127,7 @@ const handleExecSummary = createArtifactCommandHandler({
   createArtifact: createExecSummary,
   renderMarkdown: renderExecSummaryMarkdown,
   writeOutput: writeExecSummaryOutput,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format")
-  })
+  getOptions: buildFormatOptions
 });
 
 const handleFixPlan = createArtifactCommandHandler({
@@ -149,9 +136,7 @@ const handleFixPlan = createArtifactCommandHandler({
   createArtifact: createFixPlan,
   renderMarkdown: renderFixPlanMarkdown,
   writeOutput: writeFixPlanOutput,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format")
-  })
+  getOptions: buildFormatOptions
 });
 
 const handleOwnerBoard = createArtifactCommandHandler({
@@ -160,9 +145,7 @@ const handleOwnerBoard = createArtifactCommandHandler({
   createArtifact: createOwnerBoard,
   renderMarkdown: renderOwnerBoardMarkdown,
   writeOutput: writeOwnerBoardOutput,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format")
-  })
+  getOptions: buildFormatOptions
 });
 
 const handleMeetingPack = createArtifactCommandHandler({
@@ -171,9 +154,7 @@ const handleMeetingPack = createArtifactCommandHandler({
   createArtifact: createMeetingPack,
   renderMarkdown: renderMeetingPackMarkdown,
   writeOutput: writeMeetingPackOutput,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format")
-  })
+  getOptions: buildFormatOptions
 });
 
 const handlePmBrief = createArtifactCommandHandler({
@@ -182,9 +163,7 @@ const handlePmBrief = createArtifactCommandHandler({
   createArtifact: createPmBrief,
   renderMarkdown: renderPmBriefMarkdown,
   writeOutput: writePmBriefOutput,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format")
-  })
+  getOptions: buildFormatOptions
 });
 
 const handleRoadmap = createArtifactCommandHandler({
@@ -193,9 +172,7 @@ const handleRoadmap = createArtifactCommandHandler({
   createArtifact: createRoadmap,
   renderMarkdown: renderRoadmapMarkdown,
   writeOutput: writeRoadmapOutput,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format")
-  })
+  getOptions: buildFormatOptions
 });
 
 async function handleReport(args) {

package/src/cli-shared.js

@@ -33,6 +33,75 @@ export function getJsonCapableFormat(args) {
   return getFlagValue(args, "--format") || (hasFlag(args, "--json") ? "json" : undefined);
 }
 
+export function buildIntentOptions(args) {
+  return {
+    intent: getFlagValue(args, "--intent")
+  };
+}
+
+export function buildFormatOptions(args) {
+  return {
+    format: getFlagValue(args, "--format")
+  };
+}
+
+export function buildJsonCapableFormatOptions(args) {
+  return {
+    format: getJsonCapableFormat(args)
+  };
+}
+
+export function buildTaskOptions(args) {
+  return {
+    taskId: getFlagValue(args, "--task")
+  };
+}
+
+export function buildProgressOptions(args) {
+  return {
+    currentTaskId: getFlagValue(args, "--current"),
+    completedPacketIds: getFlagValue(args, "--completed"),
+    blockedReasons: getFlagValue(args, "--blocked")
+  };
+}
+
+export function buildIntentFormatOptions(args) {
+  return {
+    ...buildIntentOptions(args),
+    ...buildJsonCapableFormatOptions(args)
+  };
+}
+
+export function buildTaskFormatOptions(args) {
+  return {
+    ...buildFormatOptions(args),
+    ...buildTaskOptions(args)
+  };
+}
+
+export function buildIntentTaskFormatOptions(args) {
+  return {
+    ...buildIntentOptions(args),
+    ...buildFormatOptions(args),
+    ...buildTaskOptions(args)
+  };
+}
+
+export function buildIntentProgressFormatOptions(args) {
+  return {
+    ...buildIntentOptions(args),
+    ...buildJsonCapableFormatOptions(args),
+    ...buildProgressOptions(args)
+  };
+}
+
+export function buildProgressFormatOptions(args) {
+  return {
+    ...buildJsonCapableFormatOptions(args),
+    ...buildProgressOptions(args)
+  };
+}
+
 export async function writeOrPrintArtifact({
   args,
   commandName,
@@ -113,3 +182,23 @@ export function createStructuredOutputCommandHandler({
     process.stdout.write(renderedOutput);
   };
 }
+
+export function createActionCommandHandler({
+  execute,
+  getOutputJson,
+  renderText
+}) {
+  return async function actionCommandHandler(args) {
+    const result = await execute(args);
+    const outputJson = getOutputJson ? getOutputJson(args, result) : hasFlag(args, "--json");
+
+    if (outputJson) {
+      process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
+      return;
+    }
+
+    if (renderText) {
+      process.stdout.write(renderText(result, args));
+    }
+  };
+}

package/src/cli-shell-commands.js

@@ -1,4 +1,4 @@
-import { getFlagValue, hasFlag } from "./cli-shared.js";
+import { createActionCommandHandler, getFlagValue, hasFlag } from "./cli-shared.js";
 import { installSkill } from "./install-skill.js";
 import { getBundledSkillPath, getInstalledSkillPath, getSkillName, getSkillsDir } from "./paths.js";
 import { listBundledSkills, renderBundledSkillsMarkdown } from "./skills.js";
@@ -9,15 +9,16 @@ export const SHELL_HELP_LINES = [
   "  geo-ai-search-optimization where"
 ];
 
-async function handleInstall(args) {
-  const targetDir = getFlagValue(args, "--target");
-  const outputJson = hasFlag(args, "--json");
-  const result = await installSkill({ targetDir, silent: outputJson });
-
-  if (outputJson) {
-    process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
-  }
-}
+const handleInstall = createActionCommandHandler({
+  execute: async (args) => {
+    const outputJson = hasFlag(args, "--json");
+    return installSkill({
+      targetDir: getFlagValue(args, "--target"),
+      silent: outputJson
+    });
+  },
+  getOutputJson: (args) => hasFlag(args, "--json")
+});
 
 async function handleSkills(args) {
   const bundle = await listBundledSkills();

package/src/cli-site-ops-commands.js

@@ -1,5 +1,6 @@
 import { auditProject, renderAuditMarkdown, writeAuditOutput } from "./audit.js";
 import {
+  createActionCommandHandler,
   createStructuredOutputCommandHandler,
   getFlagValue,
   hasFlag,
@@ -74,46 +75,35 @@ const handleOnboardUrl = createStructuredOutputCommandHandler({
   getOutputJson: (args) => hasFlag(args, "--json")
 });
 
-async function handleInitLlms(args) {
-  const targetDir = args.find((value) => !value.startsWith("-")) || ".";
-  const outputJson = hasFlag(args, "--json");
-  const result = await createLlmsTxt({
-    targetDir,
-    siteName: getFlagValue(args, "--site-name"),
-    siteUrl: getFlagValue(args, "--site-url"),
-    overwrite: hasFlag(args, "--overwrite")
-  });
-
-  if (outputJson) {
-    process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
-    return;
-  }
-
-  process.stdout.write(`Created llms.txt at ${result.outputPath}\n`);
-}
-
-async function handleInitSchema(args) {
-  const [schemaType, ...rest] = args;
-  if (!schemaType || schemaType.startsWith("-")) {
-    throw new Error("init-schema requires a schema type");
-  }
-
-  const targetDir = rest.find((value) => !value.startsWith("-")) || ".";
-  const outputJson = hasFlag(rest, "--json");
-  const result = await createSchemaTemplate({
-    schemaType,
-    targetDir,
-    siteUrl: getFlagValue(rest, "--site-url"),
-    overwrite: hasFlag(rest, "--overwrite")
-  });
-
-  if (outputJson) {
-    process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
-    return;
-  }
-
-  process.stdout.write(`Created ${result.schemaType} schema template at ${result.outputPath}\n`);
-}
+const handleInitLlms = createActionCommandHandler({
+  execute: async (args) =>
+    createLlmsTxt({
+      targetDir: args.find((value) => !value.startsWith("-")) || ".",
+      siteName: getFlagValue(args, "--site-name"),
+      siteUrl: getFlagValue(args, "--site-url"),
+      overwrite: hasFlag(args, "--overwrite")
+    }),
+  getOutputJson: (args) => hasFlag(args, "--json"),
+  renderText: (result) => `Created llms.txt at ${result.outputPath}\n`
+});
+
+const handleInitSchema = createActionCommandHandler({
+  execute: async (args) => {
+    const [schemaType, ...rest] = args;
+    if (!schemaType || schemaType.startsWith("-")) {
+      throw new Error("init-schema requires a schema type");
+    }
+
+    return createSchemaTemplate({
+      schemaType,
+      targetDir: rest.find((value) => !value.startsWith("-")) || ".",
+      siteUrl: getFlagValue(rest, "--site-url"),
+      overwrite: hasFlag(rest, "--overwrite")
+    });
+  },
+  getOutputJson: (args) => hasFlag(args, "--json"),
+  renderText: (result) => `Created ${result.schemaType} schema template at ${result.outputPath}\n`
+});
 
 const handleAudit = createStructuredOutputCommandHandler({
   commandLabel: "审计",