@abelxiaoxing/cadence 1.0.4 → 1.0.6

package/config/.env.example

@@ -1,29 +1,33 @@
 # Copy to <project>/.pi/cadence/.env or ~/.pi/agent/cadence/.env.
 # The project file wins as a whole file; values are not merged or interpolated.
 
-# Optional Subagent endpoint. Any non-empty key commits the whole layer, which
-# then requires MODEL and API_URL. Empty API/bounds use the documented defaults.
+# Optional custom Subagent endpoint. To enable it, set all required values.
+# Any non-empty key commits the whole layer; partial/invalid layers fail closed.
 SUBAGENT_API_URL=
 SUBAGENT_API_KEY=
 SUBAGENT_MODEL=
-# Dialect: openai-completions (default), openai-responses, anthropic-messages.
-SUBAGENT_API=
-# Internal defaults: context window 256000, max output tokens 128000.
-SUBAGENT_CONTEXT_WINDOW=
-SUBAGENT_MAX_TOKENS=
+# Optional dialect: openai-completions (default), openai-responses,or anthropic-messages.
+# SUBAGENT_API=openai-completions
+# Optional bounds; internal defaults are 256000 and 128000 respectively.
+# SUBAGENT_CONTEXT_WINDOW=256000
+# SUBAGENT_MAX_TOKENS=128000
 
 # Per-role layers use the same six suffixes and override the global layer whole:
 # SUBAGENT_<ROLE>_<SUFFIX>, where ROLE is DESIGN_EXPLORER, CONTRACT_REVIEWER,
 # IMPLEMENTATION_WORKER, or DIAGNOSIS_WORKER. Partial/invalid layers fail closed.
 
-CONTEXT7_API_URL=https://context7.com/api/v2
-CONTEXT7_API_KEY=
+# Context7 works anonymously with its default URL. Uncomment the API key for
+# authenticated access, or the URL only when overriding the default endpoint.
+# CONTEXT7_API_URL=https://context7.com/api/v2
+# CONTEXT7_API_KEY=
 
+# Required when using the Grok search skill.
 GROK_API_URL=https://api.x.ai/v1
 GROK_API_KEY=
-GROK_MODEL=grok-4.20-non-reasoning
+# Optional model override.
+# GROK_MODEL=grok-4.20-non-reasoning
 
-# Tavily is enabled by default when TAVILY_API_KEY is set; set to false to opt out.
-TAVILY_ENABLED=true
-TAVILY_API_URL=https://api.tavily.com
-TAVILY_API_KEY=
+# Optional Tavily integration. It is enabled by default when TAVILY_API_KEY is set; set TAVILY_ENABLED to false to opt out.
+# TAVILY_ENABLED=true
+# TAVILY_API_URL=https://api.tavily.com
+# TAVILY_API_KEY=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abelxiaoxing/cadence",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Prompts, skills, and a private orchestration extension exposing the Abel four-stage workflow (/abel-init, /abel-design, /abel-implement, /abel-diagnose) with package-owned professional Agents.",
   "license": "MIT",
   "type": "module",

package/src/child-session.ts

@@ -1,5 +1,5 @@
 import path from "node:path";
-import type { Model, Usage } from "@earendil-works/pi-ai";
+import type { AssistantMessage, Model, Usage } from "@earendil-works/pi-ai";
 import {
   createAgentSession,
   defineTool,
@@ -137,6 +137,26 @@ function wrapScopedTools(
 
 export type ChildFailureKind = "failed" | "cancelled" | "timed-out";
 
+function finalDeliveryContent(message: AssistantMessage | undefined) {
+  return (
+    message?.content.filter(
+      (content) =>
+        content.type !== "thinking" &&
+        !(content.type === "text" && content.text.trim().length === 0),
+    ) ?? []
+  );
+}
+
+function isSingleStructuralSubmit(message: AssistantMessage | undefined) {
+  const content = finalDeliveryContent(message);
+  return (
+    message?.role === "assistant" &&
+    content.length === 1 &&
+    content[0]?.type === "toolCall" &&
+    content[0].name === "abel_submit_result"
+  );
+}
+
 export type ChildSessionResult =
   | {
       ok: true;
@@ -218,17 +238,15 @@ export async function runChildSession(input: {
     let finalCategory: FinalCategory;
     if (!last) {
       finalCategory = "no-final-assistant";
-    } else if (
-      last.content.length === 1 &&
-      last.content[0].type === "toolCall" &&
-      last.content[0].name === "abel_submit_result"
-    ) {
+    } else if (isSingleStructuralSubmit(last)) {
       finalCategory =
         submit.getAttempts() > 1 ? "multiple-submit" : "single-submit-only";
-    } else if (last.content.length === 1 && last.content[0].type === "text") {
-      finalCategory = "text-only";
     } else {
-      finalCategory = "mixed";
+      const content = finalDeliveryContent(last);
+      finalCategory =
+        content.length === 1 && content[0]?.type === "text"
+          ? "text-only"
+          : "mixed";
     }
     return {
       finalCategory,
@@ -336,12 +354,7 @@ export async function runChildSession(input: {
     }
     const assistants = session.messages.filter((m) => m.role === "assistant");
     const final = assistants.at(-1);
-    if (
-      final?.role !== "assistant" ||
-      final.content.length !== 1 ||
-      final.content[0]?.type !== "toolCall" ||
-      final.content[0]?.name !== "abel_submit_result"
-    ) {
+    if (!isSingleStructuralSubmit(final)) {
       disposeOnce();
       return {
         ok: false,

package/src/parent-provider.ts

@@ -82,6 +82,9 @@ function customSubagentModel(endpoint: SubagentEndpoint): Model<string> {
     cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
     contextWindow: endpoint.contextWindow,
     maxTokens: endpoint.maxTokens,
+    ...(endpoint.dialect === "openai-completions"
+      ? { compat: { supportsDeveloperRole: false } }
+      : {}),
   } as Model<string>;
 }