refactor(skills): reuse preflight instructions

Generated-By: PostHog Code
Task-Id: 73390913-7191-4450-9fd3-31dd12879508

Author: adboio

packages/core/src/task-detail/taskCreationHost.ts

@@ -1,11 +1,6 @@
 import type { ContentBlock } from "@agentclientprotocol/sdk";
 import type { CloudSkillBundleRef } from "@posthog/core/sessions/cloudArtifactIdentifiers";
-import type {
-  AlwaysOnSkillRef,
-  Workspace,
-  WorkspaceInfo,
-  WorkspaceMode,
-} from "@posthog/shared";
+import type { Workspace, WorkspaceInfo, WorkspaceMode } from "@posthog/shared";
 import type { TaskCreationApiClient } from "./taskCreationApiClient";
 
 export interface CloudPromptTransport {
@@ -108,7 +103,6 @@ export interface ITaskCreationHost {
    * too, or a typed `/my-skill` reaches the sandbox with no bundle attached.
    */
   resolveLocalSkillCommandPrompt(prompt: string): Promise<string>;
-  renderAlwaysOnSkillInstructions(skills: AlwaysOnSkillRef[]): Promise<string>;
   /**
    * Return-and-clear the pre-warmed sandbox lease matching the composer
    * selection, if one was provisioned while the user typed. The saga uploads

packages/core/src/task-detail/taskCreationSaga.ts

@@ -74,19 +74,17 @@ function addAlwaysOnSkills(
   transport: CloudPromptTransport,
   input: TaskCreationInput,
 ): CloudPromptTransport {
-  const refs = new Map(
-    (transport.skillBundles ?? []).map((skill) => [
-      `${skill.source}:${skill.path}`,
-      skill,
-    ]),
-  );
-  for (const skill of input.alwaysOnSkills ?? []) {
-    refs.set(`${skill.source}:${skill.path}`, {
+  const refs = [
+    ...(transport.skillBundles ?? []),
+    ...(input.alwaysOnSkills ?? []).map((skill) => ({
       ...skill,
       alwaysOn: true,
-    });
-  }
-  return { ...transport, skillBundles: [...refs.values()] };
+    })),
+  ];
+  const deduplicated = new Map(
+    refs.map((skill) => [`${skill.source}:${skill.path}`, skill]),
+  );
+  return { ...transport, skillBundles: [...deduplicated.values()] };
 }
 
 export class TaskCreationSaga extends Saga<
@@ -506,13 +504,6 @@ export class TaskCreationSaga extends Saga<
     const shouldConnect = !isCloudCreate && (!!input.taskId || !!agentCwd);
 
     if (shouldConnect) {
-      const alwaysOnSkillInstructions = input.alwaysOnSkills?.length
-        ? await this.readOnlyStep("resolve_always_on_skills", () =>
-            this.deps.host.renderAlwaysOnSkillInstructions(
-              input.alwaysOnSkills ?? [],
-            ),
-          )
-        : undefined;
       const initialPrompt =
         !input.taskId && input.content
           ? await this.readOnlyStep("build_prompt_blocks", () =>
@@ -550,8 +541,9 @@ export class TaskCreationSaga extends Saga<
           if (input.model) connectParams.model = input.model;
           if (input.reasoningLevel)
             connectParams.reasoningLevel = input.reasoningLevel;
-          if (alwaysOnSkillInstructions)
-            connectParams.alwaysOnSkillInstructions = alwaysOnSkillInstructions;
+          if (input.alwaysOnSkillInstructions)
+            connectParams.alwaysOnSkillInstructions =
+              input.alwaysOnSkillInstructions;
           if (importedClaude) {
             connectParams.importedSessionId = importedClaude.importedSessionId;
             connectParams.adapter = "claude";

packages/core/src/task-detail/taskInput.ts

@@ -34,6 +34,7 @@ export interface PrepareTaskInputOptions {
   channelContextId?: string;
   customInstructions?: string;
   alwaysOnSkills?: TaskCreationInput["alwaysOnSkills"];
+  alwaysOnSkillInstructions?: string;
   autoPublishCloudRuns?: boolean;
   rtkEnabledCloud?: boolean;
   allowNoRepo?: boolean;
@@ -83,6 +84,7 @@ export function prepareTaskInput(
     channelContextId: options.channelContextId,
     customInstructions: isCloud ? options.customInstructions : undefined,
     alwaysOnSkills: options.alwaysOnSkills,
+    alwaysOnSkillInstructions: options.alwaysOnSkillInstructions,
     allowNoRepo: options.allowNoRepo,
     importedMcpServers: isCloud ? options.importedMcpServers : undefined,
     relayedMcpServers: isCloud ? options.relayedMcpServers : undefined,

packages/shared/src/task-creation-domain.ts

@@ -88,6 +88,7 @@ export interface TaskCreationInput {
    */
   customInstructions?: string;
   alwaysOnSkills?: AlwaysOnSkillRef[];
+  alwaysOnSkillInstructions?: string;
   /**
    * Local (~/.claude.json) MCP servers classified as importable, forwarded to
    * the cloud sandbox in the run-creation payload. Cloud-only; local sessions

packages/ui/src/features/settings/settingsStore.ts

@@ -100,7 +100,7 @@ export interface SyncedCustomInstructions {
   truncated: boolean;
 }
 
-export type AlwaysOnSkillPreference = Omit<AlwaysOnSkillRef, "order">;
+export type AlwaysOnSkillPreference = AlwaysOnSkillRef;
 
 // ---------- Store shape ----------
 

packages/ui/src/features/task-detail/hooks/useTaskCreation.ts

@@ -320,9 +320,11 @@ export function useTaskCreation({
       const filePaths = extractFilePaths(content);
       const settings = useSettingsStore.getState();
       let alwaysOnSkills: AlwaysOnSkillRef[] = settings.alwaysOnSkills;
+      let alwaysOnSkillInstructions: string | undefined;
       while (alwaysOnSkills.length > 0) {
         try {
-          await hostClient.skills.renderAlwaysOn.query(alwaysOnSkills);
+          alwaysOnSkillInstructions =
+            await hostClient.skills.renderAlwaysOn.query(alwaysOnSkills);
           break;
         } catch (error) {
           const action = await useAlwaysOnSkillsFailureStore
@@ -342,6 +344,7 @@ export function useTaskCreation({
             }
           }
           alwaysOnSkills = [];
+          alwaysOnSkillInstructions = undefined;
         }
       }
 
@@ -410,6 +413,7 @@ export function useTaskCreation({
           channelContextId,
           customInstructions: getEffectiveCustomInstructions(settings),
           alwaysOnSkills,
+          alwaysOnSkillInstructions,
           autoPublishCloudRuns: settings.autoPublishCloudRuns,
           rtkEnabledCloud: settings.rtkEnabledCloud,
           allowNoRepo,

packages/ui/src/features/task-detail/taskCreationHostImpl.ts

@@ -156,12 +156,6 @@ export class TrpcTaskCreationHost implements ITaskCreationHost {
     );
   }
 
-  renderAlwaysOnSkillInstructions(
-    skills: Parameters<ITaskCreationHost["renderAlwaysOnSkillInstructions"]>[0],
-  ): Promise<string> {
-    return hostClient().skills.renderAlwaysOn.query(skills);
-  }
-
   takeWarmTaskLease(args: {
     repository: string;
     branch?: string | null;