@mndrk/agx 2.0.45 → 2.0.47

package/cloud-runtime/standalone/components/LinearBoard.tsx

@@ -10,6 +10,10 @@ import { useGroupChat } from "@/hooks/useGroupChat";
 import { useProcessPolling } from "@/hooks/useProcessPolling";
 import { Markdown } from "@/components/chat-ui/Markdown";
 import { stripMarkers } from "@/lib/chat-utils";
+import {
+  loadLinearBoardFilters,
+  persistLinearBoardFilters,
+} from "@/state/linearBoardFilters";
 import {
   orderParticipantIds,
   type ComposerRoutingMetadata,
@@ -139,6 +143,19 @@ interface FilterSelectProps {
   onChange: (value: string) => void;
 }
 
+interface FilterPopdownProps extends FilterSelectProps {
+  emptyLabel?: string;
+}
+
+interface MultiFilterPopdownProps {
+  label: string;
+  values: string[];
+  options: FilterOption[];
+  activeClasses: string;
+  onChange: (value: string[]) => void;
+  emptyLabel?: string;
+}
+
 function FilterSelect({ label, value, options, activeClasses, onChange }: FilterSelectProps) {
   const isActive = value.trim().length > 0;
 
@@ -168,6 +185,239 @@ function FilterSelect({ label, value, options, activeClasses, onChange }: Filter
   );
 }
 
+function FilterPopdown({
+  label,
+  value,
+  options,
+  activeClasses,
+  onChange,
+  emptyLabel,
+}: FilterPopdownProps) {
+  const [open, setOpen] = useState(false);
+  const wrapperRef = useRef<HTMLDivElement | null>(null);
+  const selectedOption = options.find((option) => option.value === value) ?? null;
+  const isActive = value.trim().length > 0;
+  const buttonLabel = selectedOption?.label ?? emptyLabel ?? label;
+
+  useEffect(() => {
+    if (!open) {
+      return;
+    }
+
+    const handlePointerDown = (event: MouseEvent) => {
+      if (wrapperRef.current && !wrapperRef.current.contains(event.target as Node)) {
+        setOpen(false);
+      }
+    };
+
+    document.addEventListener("mousedown", handlePointerDown);
+    return () => document.removeEventListener("mousedown", handlePointerDown);
+  }, [open]);
+
+  useEffect(() => {
+    setOpen(false);
+  }, [value]);
+
+  return (
+    <div className="relative" ref={wrapperRef}>
+      <button
+        type="button"
+        aria-label={label}
+        aria-haspopup="listbox"
+        aria-expanded={open}
+        className={`flex max-w-[180px] items-center gap-1 rounded-full border px-2.5 py-0.5 text-[11px] font-medium transition-colors ${
+          isActive
+            ? activeClasses
+            : "border-[var(--card-border)] text-[var(--muted-foreground)] hover:bg-[var(--card-bg)]"
+        }`}
+        onClick={() => setOpen((current) => !current)}
+      >
+        <span className="max-w-[132px] truncate">{buttonLabel}</span>
+        <ChevronDown size={12} className={`shrink-0 transition-transform ${open ? "rotate-180" : ""}`} />
+      </button>
+      {open ? (
+        <div
+          role="listbox"
+          aria-label={`${label} options`}
+          className="absolute left-0 top-full z-50 mt-1 min-w-[220px] overflow-hidden rounded-xl border border-[var(--card-border)] bg-[var(--card-bg)] p-1 shadow-lg backdrop-blur-sm"
+        >
+          {options.map((option) => {
+            const isSelected = option.value === value;
+            return (
+              <button
+                key={`${label}-${option.value || "all"}`}
+                type="button"
+                role="option"
+                aria-selected={isSelected}
+                className={`flex w-full items-center gap-2 rounded-lg px-3 py-2 text-left text-xs transition-colors ${
+                  isSelected
+                    ? "bg-[var(--background)] font-medium text-[var(--foreground)]"
+                    : "text-[var(--muted-foreground)] hover:bg-[var(--background)] hover:text-[var(--foreground)]"
+                }`}
+                onClick={() => onChange(option.value)}
+              >
+                <span
+                  className={`flex h-4 w-4 shrink-0 items-center justify-center rounded-full border ${
+                    isSelected
+                      ? "border-blue-500 bg-blue-500 text-white"
+                      : "border-[var(--card-border)]"
+                  }`}
+                >
+                  {isSelected ? <Check size={10} /> : null}
+                </span>
+                <span className="min-w-0 flex-1 truncate">{option.label}</span>
+              </button>
+            );
+          })}
+        </div>
+      ) : null}
+    </div>
+  );
+}
+
+function MultiFilterPopdown({
+  label,
+  values,
+  options,
+  activeClasses,
+  onChange,
+  emptyLabel,
+}: MultiFilterPopdownProps) {
+  const [open, setOpen] = useState(false);
+  const wrapperRef = useRef<HTMLDivElement | null>(null);
+  const selectedOptions = options.filter(
+    (option) => option.value && values.includes(option.value)
+  );
+  const isActive = selectedOptions.length > 0;
+  const buttonLabel = (() => {
+    if (selectedOptions.length === 0) {
+      return emptyLabel ?? label;
+    }
+    if (selectedOptions.length === options.length) {
+      return emptyLabel ?? label;
+    }
+    if (selectedOptions.length === 1) {
+      return selectedOptions[0]?.label ?? (emptyLabel ?? label);
+    }
+    const lowerLabel = label.toLowerCase();
+    return `${selectedOptions.length} ${lowerLabel}${lowerLabel.endsWith("s") ? "es" : "s"}`;
+  })();
+
+  useEffect(() => {
+    if (!open) {
+      return;
+    }
+
+    const handlePointerDown = (event: MouseEvent) => {
+      if (wrapperRef.current && !wrapperRef.current.contains(event.target as Node)) {
+        setOpen(false);
+      }
+    };
+
+    document.addEventListener("mousedown", handlePointerDown);
+    return () => document.removeEventListener("mousedown", handlePointerDown);
+  }, [open]);
+
+  const toggleValue = useCallback(
+    (nextValue: string) => {
+      if (!nextValue) {
+        onChange([]);
+        return;
+      }
+
+      const nextValues = values.includes(nextValue)
+        ? values.filter((value) => value !== nextValue)
+        : [...values, nextValue];
+      onChange(nextValues);
+    },
+    [onChange, values]
+  );
+
+  return (
+    <div className="relative" ref={wrapperRef}>
+      <button
+        type="button"
+        aria-label={label}
+        aria-haspopup="listbox"
+        aria-expanded={open}
+        className={`flex max-w-[180px] items-center gap-1 rounded-full border px-2.5 py-0.5 text-[11px] font-medium transition-colors ${
+          isActive
+            ? activeClasses
+            : "border-[var(--card-border)] text-[var(--muted-foreground)] hover:bg-[var(--card-bg)]"
+        }`}
+        onClick={() => setOpen((current) => !current)}
+      >
+        <span className="max-w-[132px] truncate">{buttonLabel}</span>
+        <ChevronDown size={12} className={`shrink-0 transition-transform ${open ? "rotate-180" : ""}`} />
+      </button>
+      {open ? (
+        <div
+          role="listbox"
+          aria-label={`${label} options`}
+          aria-multiselectable="true"
+          className="absolute left-0 top-full z-50 mt-1 min-w-[240px] overflow-hidden rounded-xl border border-[var(--card-border)] bg-[var(--card-bg)] p-1 shadow-lg backdrop-blur-sm"
+        >
+          <button
+            type="button"
+            role="option"
+            aria-selected={!isActive}
+            className={`flex w-full items-center gap-2 rounded-lg px-3 py-2 text-left text-xs transition-colors ${
+              !isActive
+                ? "bg-[var(--background)] font-medium text-[var(--foreground)]"
+                : "text-[var(--muted-foreground)] hover:bg-[var(--background)] hover:text-[var(--foreground)]"
+            }`}
+            onClick={() => onChange([])}
+          >
+            <span
+              className={`flex h-4 w-4 shrink-0 items-center justify-center rounded-full border ${
+                !isActive
+                  ? "border-blue-500 bg-blue-500 text-white"
+                  : "border-[var(--card-border)]"
+              }`}
+            >
+              {!isActive ? <Check size={10} /> : null}
+            </span>
+            <span className="min-w-0 flex-1 truncate">{emptyLabel ?? label}</span>
+          </button>
+          {selectedOptions.length > 0 ? (
+            <div className="px-3 pb-1 pt-2 text-[10px] font-medium uppercase tracking-[0.12em] text-[var(--muted-foreground)]">
+              Selected
+            </div>
+          ) : null}
+          {options.filter((option) => option.value).map((option) => {
+            const isSelected = values.includes(option.value);
+            return (
+              <button
+                key={`${label}-${option.value}`}
+                type="button"
+                role="option"
+                aria-selected={isSelected}
+                className={`flex w-full items-center gap-2 rounded-lg px-3 py-2 text-left text-xs transition-colors ${
+                  isSelected
+                    ? "bg-[var(--background)] font-medium text-[var(--foreground)]"
+                    : "text-[var(--muted-foreground)] hover:bg-[var(--background)] hover:text-[var(--foreground)]"
+                }`}
+                onClick={() => toggleValue(option.value)}
+              >
+                <span
+                  className={`flex h-4 w-4 shrink-0 items-center justify-center rounded border ${
+                    isSelected
+                      ? "border-blue-500 bg-blue-500 text-white"
+                      : "border-[var(--card-border)]"
+                  }`}
+                >
+                  {isSelected ? <Check size={10} /> : null}
+                </span>
+                <span className="min-w-0 flex-1 truncate">{option.label}</span>
+              </button>
+            );
+          })}
+        </div>
+      ) : null}
+    </div>
+  );
+}
+
 interface CycleOption {
   id: string;
   number: number;
@@ -761,9 +1011,12 @@ export default function LinearBoard({ projectId, projectSlug, initialShowSetting
   const [runsPanelWidth, setRunsPanelWidth] = useState(224);
   const [search, setSearch] = useState("");
   const [debouncedSearch, setDebouncedSearch] = useState("");
+  const [filterOptionsLoaded, setFilterOptionsLoaded] = useState(false);
   const [assignees, setAssignees] = useState<LinearEntityOption[]>([]);
+  const [statuses, setStatuses] = useState<string[]>([]);
   const [workspaces, setWorkspaces] = useState<LinearEntityOption[]>([]);
-  const [selectedAssigneeId, setSelectedAssigneeId] = useState("");
+  const [selectedAssigneeIds, setSelectedAssigneeIds] = useState<string[]>([]);
+  const [selectedStatuses, setSelectedStatuses] = useState<string[]>([]);
   const [cycles, setCycles] = useState<CycleOption[]>([]);
   const [selectedCycleId, setSelectedCycleId] = useState("");
   const [selectedWorkspaceId, setSelectedWorkspaceId] = useState("");
@@ -773,6 +1026,7 @@ export default function LinearBoard({ projectId, projectSlug, initialShowSetting
   const [pickerIssue, setPickerIssue] = useState<LinearIssue | null>(null);
   const [pickerAnchor, setPickerAnchor] = useState<{ top: number; left: number } | null>(null);
   const searchDebounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const skipNextFilterPersistRef = useRef(true);
 
   const handleSearchChange = useCallback((value: string) => {
     setSearch(value);
@@ -790,39 +1044,94 @@ export default function LinearBoard({ projectId, projectSlug, initialShowSetting
     };
   }, []);
 
+  useEffect(() => {
+    const storedFilters = loadLinearBoardFilters(projectSlug);
+    skipNextFilterPersistRef.current = true;
+    setSearch(storedFilters.search);
+    setDebouncedSearch(storedFilters.search);
+    setSelectedAssigneeIds(storedFilters.assigneeIds);
+    setSelectedStatuses(storedFilters.statuses);
+    setSelectedWorkspaceId(storedFilters.teamId);
+    setSelectedCycleId(storedFilters.cycleId);
+  }, [projectSlug]);
+
+  useEffect(() => {
+    if (skipNextFilterPersistRef.current) {
+      skipNextFilterPersistRef.current = false;
+      return;
+    }
+
+    persistLinearBoardFilters(projectSlug, {
+      search,
+      assigneeIds: selectedAssigneeIds,
+      statuses: selectedStatuses,
+      teamId: selectedWorkspaceId,
+      cycleId: selectedCycleId,
+    });
+  }, [projectSlug, search, selectedAssigneeIds, selectedStatuses, selectedWorkspaceId, selectedCycleId]);
+
   // Fetch filter options when connected
   useEffect(() => {
     if (!connected) return;
     let cancelled = false;
-    fetch("/api/linear/options")
+    setFilterOptionsLoaded(false);
+    const params = new URLSearchParams();
+    if (projectSlug) {
+      params.set("projectSlug", projectSlug);
+    }
+    const url = params.size > 0 ? `/api/linear/options?${params.toString()}` : "/api/linear/options";
+    fetch(url)
       .then((res) => res.json())
       .then((data) => {
         if (cancelled) {
           return;
         }
         setAssignees(Array.isArray(data.assignees) ? data.assignees : []);
+        setStatuses(Array.isArray(data.statuses) ? data.statuses : []);
         setWorkspaces(Array.isArray(data.teams) ? data.teams : []);
         setCycles(Array.isArray(data.cycles) ? data.cycles : []);
+        setFilterOptionsLoaded(true);
       })
       .catch(() => {
         if (!cancelled) {
           setAssignees([]);
+          setStatuses([]);
           setWorkspaces([]);
           setCycles([]);
+          setFilterOptionsLoaded(true);
         }
       });
     return () => {
       cancelled = true;
     };
-  }, [connected]);
+  }, [connected, projectSlug]);
 
   useEffect(() => {
-    if (selectedAssigneeId && !assignees.some((assignee) => assignee.id === selectedAssigneeId)) {
-      setSelectedAssigneeId("");
+    if (!filterOptionsLoaded) {
+      return;
     }
-  }, [assignees, selectedAssigneeId]);
+    const validAssigneeIds = selectedAssigneeIds.filter((assigneeId) =>
+      assignees.some((assignee) => assignee.id === assigneeId)
+    );
+    if (validAssigneeIds.length !== selectedAssigneeIds.length) {
+      setSelectedAssigneeIds(validAssigneeIds);
+    }
+  }, [assignees, filterOptionsLoaded, selectedAssigneeIds]);
 
   useEffect(() => {
+    if (!filterOptionsLoaded) {
+      return;
+    }
+    const validStatuses = selectedStatuses.filter((status) => statuses.includes(status));
+    if (validStatuses.length !== selectedStatuses.length) {
+      setSelectedStatuses(validStatuses);
+    }
+  }, [filterOptionsLoaded, selectedStatuses, statuses]);
+
+  useEffect(() => {
+    if (!filterOptionsLoaded) {
+      return;
+    }
     if (workspaces.length <= 1 && selectedWorkspaceId) {
       setSelectedWorkspaceId("");
       return;
@@ -831,22 +1140,29 @@ export default function LinearBoard({ projectId, projectSlug, initialShowSetting
     if (selectedWorkspaceId && !workspaces.some((workspace) => workspace.id === selectedWorkspaceId)) {
       setSelectedWorkspaceId("");
     }
-  }, [selectedWorkspaceId, workspaces]);
+  }, [filterOptionsLoaded, selectedWorkspaceId, workspaces]);
 
   useEffect(() => {
+    if (!filterOptionsLoaded) {
+      return;
+    }
     if (selectedCycleId && !cycles.some((cycle) => cycle.id === selectedCycleId)) {
       setSelectedCycleId("");
     }
-  }, [cycles, selectedCycleId]);
+  }, [cycles, filterOptionsLoaded, selectedCycleId]);
 
   const filters = useMemo(
     () => ({
       search: debouncedSearch || undefined,
-      assigneeId: selectedAssigneeId || undefined,
+      statuses:
+        selectedStatuses.length > 0 && selectedStatuses.length < statuses.length
+          ? selectedStatuses
+          : undefined,
+      assigneeIds: selectedAssigneeIds.length > 0 ? selectedAssigneeIds : undefined,
       teamId: selectedWorkspaceId || undefined,
       cycleId: selectedCycleId || undefined,
     }),
-    [debouncedSearch, selectedAssigneeId, selectedCycleId, selectedWorkspaceId]
+    [debouncedSearch, selectedAssigneeIds, selectedCycleId, selectedStatuses, selectedWorkspaceId, statuses.length]
   );
 
   const {
@@ -865,9 +1181,13 @@ export default function LinearBoard({ projectId, projectSlug, initialShowSetting
 
   const selectedRun = runs.find((run) => run.id === selectedRunId) ?? null;
   const assigneeOptions = useMemo<FilterOption[]>(
-    () => [{ value: "", label: "Assignee" }, ...assignees.map((assignee) => ({ value: assignee.id, label: assignee.name }))],
+    () => assignees.map((assignee) => ({ value: assignee.id, label: assignee.name })),
     [assignees]
   );
+  const statusOptions = useMemo<FilterOption[]>(
+    () => statuses.map((status) => ({ value: status, label: status })),
+    [statuses]
+  );
   const workspaceOptions = useMemo<FilterOption[]>(
     () => [{ value: "", label: "Workspace" }, ...workspaces.map((workspace) => ({ value: workspace.id, label: workspace.name }))],
     [workspaces]
@@ -882,6 +1202,7 @@ export default function LinearBoard({ projectId, projectSlug, initialShowSetting
     ],
     [cycles]
   );
+  const showStatusFilter = statusOptions.length > 0;
   const showCycleFilter = cycleOptions.length > 1;
   const showWorkspaceFilter = workspaceOptions.length > 2;
 
@@ -1135,12 +1456,23 @@ export default function LinearBoard({ projectId, projectSlug, initialShowSetting
             </button>
           </div>
           <div className="flex items-center gap-1.5 px-3 pb-2">
-            <FilterSelect
+            {showStatusFilter ? (
+              <MultiFilterPopdown
+                label="Status"
+                values={selectedStatuses}
+                options={statusOptions}
+                activeClasses="border-amber-500/30 bg-amber-500/10 text-amber-300"
+                onChange={setSelectedStatuses}
+                emptyLabel="All statuses"
+              />
+            ) : null}
+            <MultiFilterPopdown
               label="Assignee"
-              value={selectedAssigneeId}
+              values={selectedAssigneeIds}
               options={assigneeOptions}
               activeClasses="border-blue-500/30 bg-blue-500/10 text-blue-400"
-              onChange={setSelectedAssigneeId}
+              onChange={setSelectedAssigneeIds}
+              emptyLabel="All assignees"
             />
             {showWorkspaceFilter ? (
               <FilterSelect

package/cloud-runtime/standalone/components/thread/WorkspaceSidebar.tsx

@@ -398,16 +398,6 @@ export function WorkspaceSidebar({
           </div>
         )}
 
-        <nav className="workspace-sidebar__section" style={{ gap: 0 }}>
-          <Link
-            href="/agents"
-            className="workspace-sidebar__nav-item"
-          >
-            <Bot size={14} className="flex-shrink-0" />
-            Manage Agents
-          </Link>
-        </nav>
-
         <nav className="workspace-sidebar__section">
           <div className="workspace-sidebar__section-header group/projects-header">
             <p className="workspace-sidebar__section-label">Projects</p>
@@ -536,6 +526,15 @@ export function WorkspaceSidebar({
                     <div className="pt-1">
                       <div className="group/repos-header flex items-center justify-between px-3 py-1">
                         <p className="text-[10px] font-medium text-[var(--muted-foreground)] uppercase tracking-wide">Folders</p>
+                        <div className="flex items-center gap-1">
+                          <Link
+                            href="/folders"
+                            className="workspace-sidebar__action opacity-0 transition-opacity group-hover/repos-header:opacity-100 text-[var(--muted-foreground)] hover:text-white"
+                            aria-label="Manage folders"
+                            title="Manage folders"
+                          >
+                            <Settings size={12} />
+                          </Link>
                         <button
                           type="button"
                           className="workspace-sidebar__action opacity-0 transition-opacity group-hover/repos-header:opacity-100 text-[var(--muted-foreground)] hover:text-white"
@@ -557,6 +556,7 @@ export function WorkspaceSidebar({
                         >
                           <Plus size={12} />
                         </button>
+                        </div>
                       </div>
                       {project.repos.length > 0 ? (
                         project.repos.map((repo) => (
@@ -613,6 +613,15 @@ export function WorkspaceSidebar({
                     <div className="pt-1">
                       <div className="group/agents-header flex items-center justify-between px-3 py-1">
                         <p className="text-[10px] font-medium text-[var(--muted-foreground)] uppercase tracking-wide">Agents</p>
+                        <div className="flex items-center gap-1">
+                          <Link
+                            href="/agents"
+                            className="workspace-sidebar__action opacity-0 transition-opacity group-hover/agents-header:opacity-100 text-[var(--muted-foreground)] hover:text-white"
+                            aria-label="Manage agents"
+                            title="Manage agents"
+                          >
+                            <Settings size={12} />
+                          </Link>
                         {project.agents.length > 0 && (
                           <button
                             type="button"
@@ -624,6 +633,7 @@ export function WorkspaceSidebar({
                             <Plus size={12} />
                           </button>
                         )}
+                        </div>
                       </div>
                       {project.agents.length > 0 ? (
                         <>

package/cloud-runtime/standalone/hooks/useLinearIssues.ts

@@ -12,9 +12,9 @@ export interface LinearIssue {
 
 interface Filters {
   teamId?: string;
-  status?: string;
+  statuses?: string[];
   search?: string;
-  assigneeId?: string;
+  assigneeIds?: string[];
   assignedToMe?: boolean;
   cycleId?: string;
 }
@@ -56,9 +56,17 @@ export function useLinearIssues(
       try {
         const params = new URLSearchParams();
         if (filters.teamId) params.set("teamId", filters.teamId);
-        if (filters.status) params.set("status", filters.status);
+        if (filters.statuses?.length) {
+          for (const status of filters.statuses) {
+            params.append("status", status);
+          }
+        }
         if (filters.search) params.set("search", filters.search);
-        if (filters.assigneeId) params.set("assigneeId", filters.assigneeId);
+        if (filters.assigneeIds?.length) {
+          for (const assigneeId of filters.assigneeIds) {
+            params.append("assigneeId", assigneeId);
+          }
+        }
         else if (filters.assignedToMe) params.set("assignedToMe", "true");
         if (filters.cycleId) params.set("cycleId", filters.cycleId);
         if (append && cursorRef.current) params.set("cursor", cursorRef.current);
@@ -80,7 +88,7 @@ export function useLinearIssues(
         setLoading(false);
       }
     },
-    [filters.teamId, filters.status, filters.search, filters.assigneeId, filters.assignedToMe, filters.cycleId, enabled, options.projectSlug, options.limit],
+    [filters.teamId, filters.statuses, filters.search, filters.assigneeIds, filters.assignedToMe, filters.cycleId, enabled, options.projectSlug, options.limit],
   );
 
   useEffect(() => {

package/cloud-runtime/standalone/instrumentation.ts

@@ -4,11 +4,14 @@ const PROMPT_JOB_POLL_INTERVAL_MS = 15_000;
 export async function register() {
   if (process.env.NEXT_RUNTIME === 'nodejs') {
     const { getConfiguredLocalServerPort } = await import("./lib/app-config");
+    const { ensureScheduledTaskSkillInstalled } = await import("./lib/scheduled-task-skill");
     await import("./lib/check-node-version");
     const { getQueue, QUEUE_NAMES } = await import('@/lib/queue/boss');
     const { taskProcessor } = await import('@/lib/orchestrator/processor');
     const { chatProcessor } = await import('@/lib/orchestrator/chat-processor');
 
+    ensureScheduledTaskSkillInstalled();
+
     const queue = await getQueue();
     await queue.work(QUEUE_NAMES.TASK_PROCESS, taskProcessor, { batchSize: 5 });
     await queue.work(QUEUE_NAMES.CHAT_RUN_PROCESS, chatProcessor, { batchSize: 2 });

package/cloud-runtime/standalone/lib/cli-runner.ts

@@ -5,6 +5,7 @@ import type { ChatProvider } from "./types";
 import { createCliChunkSanitizer } from "./sanitize";
 import { writeDebugLog } from "./debug-log";
 import { buildSpawnEnv, commandExists } from "./shell-env";
+import { buildScheduledTaskSkillPromptContext } from "./scheduled-task-skill";
 
 const isNonEmptyString = (value: unknown): value is string =>
   typeof value === "string" && value.trim().length > 0;
@@ -711,12 +712,12 @@ export async function runCliResponse({
     if (cleaned) onDelta(cleaned);
   };
 
-  const systemParts: string[] = [];
-  if (systemContext) systemParts.push(systemContext);
-  if (identity) systemParts.push(`<identity>\n${identity}\n</identity>`);
-  if (self) systemParts.push(`<self>\n${self}\n</self>`);
-  if (skills) systemParts.push(`<skills>\n${skills}\n</skills>`);
-  const systemPrompt = systemParts.length > 0 ? systemParts.join("\n\n") : undefined;
+  const systemPrompt = buildCliSystemPrompt({
+    identity,
+    self,
+    skills,
+    systemContext,
+  });
   const attempts = buildCliAttempts({
     provider,
     model,
@@ -789,3 +790,23 @@ export async function runCliResponse({
 
   throw lastError || new Error("CLI execution failed.");
 }
+
+export function buildCliSystemPrompt({
+  identity,
+  self,
+  skills,
+  systemContext,
+}: {
+  identity?: string;
+  self?: string;
+  skills?: string;
+  systemContext?: string;
+}): string | undefined {
+  const systemParts: string[] = [];
+  if (systemContext) systemParts.push(systemContext);
+  systemParts.push(buildScheduledTaskSkillPromptContext());
+  if (identity) systemParts.push(`<identity>\n${identity}\n</identity>`);
+  if (self) systemParts.push(`<self>\n${self}\n</self>`);
+  if (skills) systemParts.push(`<skills>\n${skills}\n</skills>`);
+  return systemParts.length > 0 ? systemParts.join("\n\n") : undefined;
+}