geo-ai-search-optimization 1.3.9 → 1.3.11

package/README.md

@@ -902,6 +902,21 @@ geo-ai-search-optimization help
 - `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.3.11
+
+- 继续收敛原本仍较特殊的命令编排
+- `src/cli-shared.js` 新增 `buildTaskOutputDirOptions / buildTaskFormatOutputDirOptions / createContentCommandHandler`
+- `src/cli-planning-delivery-commands.js` 中的 `report` 已改成统一 content handler
+- `export-pack / html-pack / publish-pack` 也开始复用共享 output-dir / task builder
+- CLI 更接近统一的 command registry，而不是混合少数特例 handler
+
 ## New in 1.2.20
 
 - 新增 `agent-continue`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geo-ai-search-optimization",
-  "version": "1.3.9",
+  "version": "1.3.11",
   "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,10 +18,14 @@ import { generateReport, writeReportOutput } from "./report.js";
 import { createRoadmap, renderRoadmapMarkdown, writeRoadmapOutput } from "./roadmap.js";
 import { createSharePack, renderSharePackMarkdown, writeSharePackOutput } from "./share-pack.js";
 import {
+  buildFormatOptions,
+  buildTaskFormatOutputDirOptions,
+  buildTaskOutputDirOptions,
+  createContentCommandHandler,
+  buildTaskFormatOptions,
   createArtifactCommandHandler,
   createPackCommandHandler,
   getFlagValue,
-  getRequiredInput,
   parsePositiveInteger
 } from "./cli-shared.js";
 
@@ -49,9 +53,7 @@ const handleAgentHandoff = createArtifactCommandHandler({
   createArtifact: createAgentHandoff,
   renderMarkdown: renderAgentHandoffMarkdown,
   writeOutput: writeAgentHandoffOutput,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format")
-  })
+  getOptions: buildFormatOptions
 });
 
 const handleApplyPlan = createArtifactCommandHandler({
@@ -60,10 +62,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 +71,7 @@ const handleCompletionReport = createArtifactCommandHandler({
   createArtifact: createCompletionReport,
   renderMarkdown: renderCompletionReportMarkdown,
   writeOutput: writeCompletionReportOutput,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format")
-  })
+  getOptions: buildFormatOptions
 });
 
 const handleHandoffBundle = createArtifactCommandHandler({
@@ -83,10 +80,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,41 +89,28 @@ const handleSharePack = createArtifactCommandHandler({
   createArtifact: createSharePack,
   renderMarkdown: renderSharePackMarkdown,
   writeOutput: writeSharePackOutput,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format"),
-    taskId: getFlagValue(args, "--task")
-  })
+  getOptions: buildTaskFormatOptions
 });
 
 const handleExportPack = createPackCommandHandler({
   commandName: "export-pack",
   writePack: writeExportPack,
   renderMarkdown: renderExportPackMarkdown,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format"),
-    taskId: getFlagValue(args, "--task"),
-    outputDir: getFlagValue(args, "--out-dir")
-  })
+  getOptions: buildTaskFormatOutputDirOptions
 });
 
 const handleHtmlPack = createPackCommandHandler({
   commandName: "html-pack",
   writePack: writeHtmlPack,
   renderMarkdown: renderHtmlPackMarkdown,
-  getOptions: (args) => ({
-    taskId: getFlagValue(args, "--task"),
-    outputDir: getFlagValue(args, "--out-dir")
-  })
+  getOptions: buildTaskOutputDirOptions
 });
 
 const handlePublishPack = createPackCommandHandler({
   commandName: "publish-pack",
   writePack: writePublishPack,
   renderMarkdown: renderPublishPackMarkdown,
-  getOptions: (args) => ({
-    taskId: getFlagValue(args, "--task"),
-    outputDir: getFlagValue(args, "--out-dir")
-  })
+  getOptions: buildTaskOutputDirOptions
 });
 
 const handleExecSummary = createArtifactCommandHandler({
@@ -138,9 +119,7 @@ const handleExecSummary = createArtifactCommandHandler({
   createArtifact: createExecSummary,
   renderMarkdown: renderExecSummaryMarkdown,
   writeOutput: writeExecSummaryOutput,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format")
-  })
+  getOptions: buildFormatOptions
 });
 
 const handleFixPlan = createArtifactCommandHandler({
@@ -149,9 +128,7 @@ const handleFixPlan = createArtifactCommandHandler({
   createArtifact: createFixPlan,
   renderMarkdown: renderFixPlanMarkdown,
   writeOutput: writeFixPlanOutput,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format")
-  })
+  getOptions: buildFormatOptions
 });
 
 const handleOwnerBoard = createArtifactCommandHandler({
@@ -160,9 +137,7 @@ const handleOwnerBoard = createArtifactCommandHandler({
   createArtifact: createOwnerBoard,
   renderMarkdown: renderOwnerBoardMarkdown,
   writeOutput: writeOwnerBoardOutput,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format")
-  })
+  getOptions: buildFormatOptions
 });
 
 const handleMeetingPack = createArtifactCommandHandler({
@@ -171,9 +146,7 @@ const handleMeetingPack = createArtifactCommandHandler({
   createArtifact: createMeetingPack,
   renderMarkdown: renderMeetingPackMarkdown,
   writeOutput: writeMeetingPackOutput,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format")
-  })
+  getOptions: buildFormatOptions
 });
 
 const handlePmBrief = createArtifactCommandHandler({
@@ -182,9 +155,7 @@ const handlePmBrief = createArtifactCommandHandler({
   createArtifact: createPmBrief,
   renderMarkdown: renderPmBriefMarkdown,
   writeOutput: writePmBriefOutput,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format")
-  })
+  getOptions: buildFormatOptions
 });
 
 const handleRoadmap = createArtifactCommandHandler({
@@ -193,31 +164,25 @@ const handleRoadmap = createArtifactCommandHandler({
   createArtifact: createRoadmap,
   renderMarkdown: renderRoadmapMarkdown,
   writeOutput: writeRoadmapOutput,
-  getOptions: (args) => ({
-    format: getFlagValue(args, "--format")
-  })
+  getOptions: buildFormatOptions
 });
 
-async function handleReport(args) {
-  const input = getRequiredInput(args, "report");
-  const maxFileSizeValue = getFlagValue(args, "--max-file-size");
-  const maxExamplesValue = getFlagValue(args, "--max-examples");
-  const report = await generateReport(input, {
-    mode: getFlagValue(args, "--mode"),
-    format: getFlagValue(args, "--format"),
-    maxFileSize: maxFileSizeValue ? parsePositiveInteger(maxFileSizeValue, "--max-file-size") : undefined,
-    maxExamples: maxExamplesValue ? parsePositiveInteger(maxExamplesValue, "--max-examples") : undefined
-  });
-
-  const outputPath = getFlagValue(args, "--out");
-  if (outputPath) {
-    const resolvedOutputPath = await writeReportOutput(outputPath, report.content);
-    process.stdout.write(`已保存报告：${resolvedOutputPath}\n`);
-    return;
-  }
-
-  process.stdout.write(report.content);
-}
+const handleReport = createContentCommandHandler({
+  commandName: "report",
+  execute: async (input, args) => {
+    const maxFileSizeValue = getFlagValue(args, "--max-file-size");
+    const maxExamplesValue = getFlagValue(args, "--max-examples");
+
+    return generateReport(input, {
+      mode: getFlagValue(args, "--mode"),
+      format: getFlagValue(args, "--format"),
+      maxFileSize: maxFileSizeValue ? parsePositiveInteger(maxFileSizeValue, "--max-file-size") : undefined,
+      maxExamples: maxExamplesValue ? parsePositiveInteger(maxExamplesValue, "--max-examples") : undefined
+    });
+  },
+  getContent: (report) => report.content,
+  writeOutput: writeReportOutput
+});
 
 export const PLANNING_DELIVERY_COMMAND_HANDLERS = {
   "agent-handoff": handleAgentHandoff,

package/src/cli-shared.js

@@ -33,6 +33,95 @@ 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 buildOutputDirOptions(args) {
+  return {
+    outputDir: getFlagValue(args, "--out-dir")
+  };
+}
+
+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 buildTaskOutputDirOptions(args) {
+  return {
+    ...buildTaskOptions(args),
+    ...buildOutputDirOptions(args)
+  };
+}
+
+export function buildTaskFormatOutputDirOptions(args) {
+  return {
+    ...buildFormatOptions(args),
+    ...buildTaskOutputDirOptions(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,
@@ -133,3 +222,25 @@ export function createActionCommandHandler({
     }
   };
 }
+
+export function createContentCommandHandler({
+  commandName,
+  execute,
+  getContent,
+  writeOutput
+}) {
+  return async function contentCommandHandler(args) {
+    const input = getRequiredInput(args, commandName);
+    const result = await execute(input, args);
+    const content = getContent(result);
+    const outputPath = getFlagValue(args, "--out");
+
+    if (outputPath) {
+      const resolvedOutputPath = await writeOutput(outputPath, content);
+      process.stdout.write(`已保存${commandName === "report" ? "报告" : ` ${commandName} 结果`}：${resolvedOutputPath}\n`);
+      return;
+    }
+
+    process.stdout.write(content);
+  };
+}