Skip to content

fix(server): preserve Claude goals that mention skills #29930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
voltcrash wants to merge 2 commits into from
Closed

fix(server): preserve Claude goals that mention skills #29930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
509525d
fix(server): preserve Claude goals that mention skills
voltcrash Nov 3, 2026
8ff7749
merge: sync main into claude goal skill dispatch
maria-rcks Nov 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20297,6 +20297,13 @@ describe("ClaudeAdapterV2 background wake turns", () => {
);

describe("native goals", () => {
it("preserves a multiline /goal as a native command when its objective mentions a skill", () => {
const skills = new Map([["review", { path: "/home/me/.claude/skills/review/SKILL.md" }]]);
const text = "/goal fix all the gaps.\ndecompile target.ipa into ./target/\n$review";
const message = ClaudeAdapterV2.makeClaudeUserMessage({ text, skills });
assert.equal(message.message.content, text);
});

const syntheticFrame = (uuid: string, text: string) =>
claudeSdkFrame({
type: "assistant",
Expand Down
6 changes: 5 additions & 1 deletion apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ import {
TrimmedNonEmptyString,
defaultInstanceIdForDriver,
isCompactionCommandMessage,
parseGoalCommand,
type MessageId,
type ModelSelection,
type OrchestrationV2ConversationMessage,
Expand Down Expand Up @@ -2418,8 +2419,11 @@ export function makeClaudeUserMessage(input: {
}): SDKUserMessage {
// Claude expands a skill only when `/name` starts the last text block.
// Keep the whole request before that block; see ClaudeSkillDispatch.
// Keep /goal on the native command path instead of dispatching a skill in its objective.
const dispatch =
input.skills === undefined ? undefined : planClaudeSkillDispatch(input.text, input.skills);
input.skills === undefined || parseGoalCommand(input) !== null
? undefined
: planClaudeSkillDispatch(input.text, input.skills);
return {
type: "user",
message: {
Expand Down
Loading