gsd-pi 2.35.0-dev.39eee32 → 2.35.0-dev.4bbf377

package/README.md

@@ -455,7 +455,9 @@ auto_report: true
 
 ### Agent Instructions
 
-Create an `agent-instructions.md` file in your project root to inject persistent per-project behavioral guidance into every agent session. This file is loaded automatically and provides project-specific context the LLM should always have — coding standards, architectural decisions, domain terminology, or workflow preferences.
+Place an `AGENTS.md` file in any directory to provide persistent behavioral guidance for that scope. Pi core loads `AGENTS.md` automatically (with `CLAUDE.md` as a fallback) at both user and project levels. Use these files for coding standards, architectural decisions, domain terminology, or workflow preferences.
+
+> **Note:** The legacy `agent-instructions.md` format (`~/.gsd/agent-instructions.md` and `.gsd/agent-instructions.md`) is deprecated and no longer loaded. Migrate any existing instructions to `AGENTS.md` or `CLAUDE.md`.
 
 ### Debug Mode
 

package/dist/resources/extensions/gsd/auto-loop.js

@@ -632,6 +632,11 @@ export async function autoLoop(ctx, pi, s, deps) {
                 unitType,
                 unitId,
             });
+            // Detect retry and capture previous tier for escalation
+            const isRetry = !!(s.currentUnit &&
+                s.currentUnit.type === unitType &&
+                s.currentUnit.id === unitId);
+            const previousTier = s.currentUnitRouting?.tier;
             // Closeout previous unit
             if (s.currentUnit) {
                 await deps.closeoutUnit(ctx, s.basePath, s.currentUnit.type, s.currentUnit.id, s.currentUnit.startedAt, deps.buildSnapshotOpts(s.currentUnit.type, s.currentUnit.id));
@@ -737,8 +742,8 @@ export async function autoLoop(ctx, pi, s, deps) {
                 const msg = reorderErr instanceof Error ? reorderErr.message : String(reorderErr);
                 process.stderr.write(`[gsd] prompt reorder failed (non-fatal): ${msg}\n`);
             }
-            // Select and apply model
-            const modelResult = await deps.selectAndApplyModel(ctx, pi, unitType, unitId, s.basePath, prefs, s.verbose, s.autoModeStartModel);
+            // Select and apply model (with tier escalation on retry)
+            const modelResult = await deps.selectAndApplyModel(ctx, pi, unitType, unitId, s.basePath, prefs, s.verbose, s.autoModeStartModel, { isRetry, previousTier });
             s.currentUnitRouting =
                 modelResult.routing;
             // Start unit supervision

package/dist/resources/extensions/gsd/auto-model-selection.js

@@ -5,7 +5,7 @@
  */
 import { resolveModelWithFallbacksForUnit, resolveDynamicRoutingConfig } from "./preferences.js";
 import { classifyUnitComplexity, tierLabel } from "./complexity-classifier.js";
-import { resolveModelForComplexity } from "./model-router.js";
+import { resolveModelForComplexity, escalateTier } from "./model-router.js";
 import { getLedger, getProjectTotals } from "./metrics.js";
 import { unitPhaseLabel } from "./auto-dashboard.js";
 /**
@@ -15,7 +15,7 @@ import { unitPhaseLabel } from "./auto-dashboard.js";
  *
  * Returns routing metadata for metrics tracking.
  */
-export async function selectAndApplyModel(ctx, pi, unitType, unitId, basePath, prefs, verbose, autoModeStartModel) {
+export async function selectAndApplyModel(ctx, pi, unitType, unitId, basePath, prefs, verbose, autoModeStartModel, retryContext) {
     const modelConfig = resolveModelWithFallbacksForUnit(unitType);
     let routing = null;
     if (modelConfig) {
@@ -37,8 +37,20 @@ export async function selectAndApplyModel(ctx, pi, unitType, unitId, basePath, p
             const isHook = unitType.startsWith("hook/");
             const shouldClassify = !isHook || routingConfig.hooks !== false;
             if (shouldClassify) {
-                const classification = classifyUnitComplexity(unitType, unitId, basePath, budgetPct);
+                let classification = classifyUnitComplexity(unitType, unitId, basePath, budgetPct);
                 const availableModelIds = availableModels.map(m => m.id);
+                // Escalate tier on retry when escalate_on_failure is enabled (default: true)
+                if (retryContext?.isRetry &&
+                    retryContext.previousTier &&
+                    routingConfig.escalate_on_failure !== false) {
+                    const escalated = escalateTier(retryContext.previousTier);
+                    if (escalated) {
+                        classification = { ...classification, tier: escalated, reason: "escalated after failure" };
+                        if (verbose) {
+                            ctx.ui.notify(`Tier escalation: ${retryContext.previousTier} → ${escalated} (retry after failure)`, "info");
+                        }
+                    }
+                }
                 const routingResult = resolveModelForComplexity(classification, modelConfig, routingConfig, availableModelIds);
                 if (routingResult.wasDowngraded) {
                     effectiveModelConfig = {

package/dist/resources/extensions/gsd/commands-rate.js

@@ -0,0 +1,31 @@
+/**
+ * /gsd rate — Submit feedback on the last unit's model tier assignment.
+ * Feeds into the adaptive routing history so future dispatches improve.
+ */
+import { loadLedgerFromDisk } from "./metrics.js";
+import { recordFeedback, initRoutingHistory } from "./routing-history.js";
+const VALID_RATINGS = new Set(["over", "under", "ok"]);
+export async function handleRate(args, ctx, basePath) {
+    const rating = args.trim().toLowerCase();
+    if (!rating || !VALID_RATINGS.has(rating)) {
+        ctx.ui.notify("Usage: /gsd rate <over|ok|under>\n" +
+            "  over  — model was overpowered for that task (encourage cheaper)\n" +
+            "  ok    — model was appropriate\n" +
+            "  under — model was too weak (encourage stronger)", "info");
+        return;
+    }
+    const ledger = loadLedgerFromDisk(basePath);
+    if (!ledger || ledger.units.length === 0) {
+        ctx.ui.notify("No completed units found — nothing to rate.", "warning");
+        return;
+    }
+    const lastUnit = ledger.units[ledger.units.length - 1];
+    const tier = lastUnit.tier;
+    if (!tier) {
+        ctx.ui.notify("Last unit has no tier data (dynamic routing was not active). Rating skipped.", "warning");
+        return;
+    }
+    initRoutingHistory(basePath);
+    recordFeedback(lastUnit.type, lastUnit.id, tier, rating);
+    ctx.ui.notify(`Recorded "${rating}" for ${lastUnit.type}/${lastUnit.id} at tier ${tier}.`, "info");
+}

package/dist/resources/extensions/gsd/commands.js

@@ -36,6 +36,7 @@ import { computeProgressScore, formatProgressLine } from "./progress-score.js";
 import { runEnvironmentChecks } from "./doctor-environment.js";
 import { handleLogs } from "./commands-logs.js";
 import { handleStart, handleTemplates, getTemplateCompletions } from "./commands-workflow-templates.js";
+import { readSessionLockData, isSessionLockProcessAlive } from "./session-lock.js";
 /** Resolve the effective project root, accounting for worktree paths. */
 export function projectRoot() {
     const cwd = process.cwd();
@@ -54,6 +55,38 @@ export function projectRoot() {
     }
     return root;
 }
+/**
+ * Check if another process holds the auto-mode session lock.
+ * Returns the lock data if a remote session is alive, null otherwise.
+ */
+function getRemoteAutoSession(basePath) {
+    const lockData = readSessionLockData(basePath);
+    if (!lockData)
+        return null;
+    if (lockData.pid === process.pid)
+        return null;
+    if (!isSessionLockProcessAlive(lockData))
+        return null;
+    return { pid: lockData.pid };
+}
+/**
+ * Show a steering menu when auto-mode is running in another process.
+ * Returns true if a remote session was detected (caller should return early).
+ */
+function notifyRemoteAutoActive(ctx, basePath) {
+    const remote = getRemoteAutoSession(basePath);
+    if (!remote)
+        return false;
+    ctx.ui.notify(`Auto-mode is running in another process (PID ${remote.pid}).\n` +
+        `Use these commands to interact with it:\n` +
+        `  /gsd status   — check progress\n` +
+        `  /gsd discuss  — discuss architecture decisions\n` +
+        `  /gsd queue    — queue the next milestone\n` +
+        `  /gsd steer    — apply an override to active work\n` +
+        `  /gsd capture  — fire-and-forget thought\n` +
+        `  /gsd stop     — stop auto-mode`, "warning");
+    return true;
+}
 export function registerGSDCommand(pi) {
     pi.registerCommand("gsd", {
         description: "GSD — Get Shit Done: /gsd help|start|templates|next|auto|stop|pause|status|visualize|queue|quick|capture|triage|dispatch|history|undo|skip|export|cleanup|mode|prefs|config|keys|hooks|run-hook|skill-health|doctor|forensics|changelog|migrate|remote|steer|knowledge|new-milestone|parallel|update",
@@ -74,6 +107,7 @@ export function registerGSDCommand(pi) {
                 { cmd: "triage", desc: "Manually trigger triage of pending captures" },
                 { cmd: "dispatch", desc: "Dispatch a specific phase directly" },
                 { cmd: "history", desc: "View execution history" },
+                { cmd: "rate", desc: "Rate last unit's model tier (over/ok/under) — improves adaptive routing" },
                 { cmd: "undo", desc: "Revert last completed unit" },
                 { cmd: "skip", desc: "Prevent a unit from auto-mode dispatch" },
                 { cmd: "export", desc: "Export milestone/slice results" },
@@ -459,6 +493,8 @@ export async function handleGSDCommand(args, ctx, pi) {
             await handleDryRun(ctx, projectRoot());
             return;
         }
+        if (notifyRemoteAutoActive(ctx, projectRoot()))
+            return;
         const verboseMode = trimmed.includes("--verbose");
         const debugMode = trimmed.includes("--debug");
         if (debugMode)
@@ -513,6 +549,11 @@ export async function handleGSDCommand(args, ctx, pi) {
         await handleUndo(trimmed.replace(/^undo\s*/, "").trim(), ctx, pi, projectRoot());
         return;
     }
+    if (trimmed === "rate" || trimmed.startsWith("rate ")) {
+        const { handleRate } = await import("./commands-rate.js");
+        await handleRate(trimmed.replace(/^rate\s*/, "").trim(), ctx, projectRoot());
+        return;
+    }
     if (trimmed.startsWith("skip ")) {
         await handleSkip(trimmed.replace(/^skip\s*/, "").trim(), ctx, projectRoot());
         return;
@@ -809,7 +850,8 @@ Examples:
         return;
     }
     if (trimmed === "") {
-        // Bare /gsd defaults to step mode
+        if (notifyRemoteAutoActive(ctx, projectRoot()))
+            return;
         await startAuto(ctx, pi, projectRoot(), false, { step: true });
         return;
     }

package/dist/resources/extensions/gsd/guided-flow.js

@@ -17,6 +17,7 @@ import { resolveExpectedArtifactPath } from "./auto.js";
 import { gsdRoot, milestonesDir, resolveMilestoneFile, resolveSliceFile, resolveSlicePath, resolveGsdRootFile, relGsdRootFile, relMilestoneFile, relSliceFile, } from "./paths.js";
 import { join } from "node:path";
 import { readFileSync, existsSync, mkdirSync, readdirSync, unlinkSync } from "node:fs";
+import { readSessionLockData, isSessionLockProcessAlive } from "./session-lock.js";
 import { nativeIsRepo, nativeInit } from "./native-git-bridge.js";
 import { ensureGitignore, ensurePreferences, untrackRuntimeFiles } from "./gitignore.js";
 import { loadEffectiveGSDPreferences } from "./preferences.js";
@@ -426,7 +427,12 @@ export async function showDiscuss(ctx, pi, basePath) {
         // If all pending slices are discussed, notify and exit instead of looping
         const allDiscussed = pendingSlices.every(s => discussedMap.get(s.id));
         if (allDiscussed) {
-            ctx.ui.notify(`All ${pendingSlices.length} slices discussed. Run /gsd to start planning.`, "info");
+            const lockData = readSessionLockData(basePath);
+            const remoteAutoRunning = lockData && lockData.pid !== process.pid && isSessionLockProcessAlive(lockData);
+            const nextStep = remoteAutoRunning
+                ? "Auto-mode is already running — use /gsd status to check progress."
+                : "Run /gsd to start planning.";
+            ctx.ui.notify(`All ${pendingSlices.length} slices discussed. ${nextStep}`, "info");
             return;
         }
         // Find the first undiscussed slice to recommend

package/dist/resources/extensions/gsd/index.js

@@ -46,33 +46,21 @@ import { pauseAutoForProviderError, classifyProviderError } from "./provider-err
 import { toPosixPath } from "../shared/mod.js";
 import { isParallelActive, shutdownParallel } from "./parallel-orchestrator.js";
 import { DEFAULT_BASH_TIMEOUT_SECS } from "./constants.js";
-// ── Agent Instructions ────────────────────────────────────────────────────
-// Lightweight "always follow" files injected into every GSD agent session.
-// Global: ~/.gsd/agent-instructions.md   Project: .gsd/agent-instructions.md
-// Both are loaded and concatenated (global first, project appends).
-function loadAgentInstructions() {
-    const parts = [];
-    const globalPath = join(homedir(), ".gsd", "agent-instructions.md");
-    if (existsSync(globalPath)) {
-        try {
-            const content = readFileSync(globalPath, "utf-8").trim();
-            if (content)
-                parts.push(content);
-        }
-        catch { /* non-fatal — skip unreadable file */ }
-    }
-    const projectPath = join(process.cwd(), ".gsd", "agent-instructions.md");
-    if (existsSync(projectPath)) {
-        try {
-            const content = readFileSync(projectPath, "utf-8").trim();
-            if (content)
-                parts.push(content);
+// ── Agent Instructions (DEPRECATED) ──────────────────────────────────────
+// agent-instructions.md is deprecated. Use AGENTS.md or CLAUDE.md instead.
+// Pi core natively supports AGENTS.md (with CLAUDE.md fallback) per directory.
+function warnDeprecatedAgentInstructions() {
+    const paths = [
+        join(homedir(), ".gsd", "agent-instructions.md"),
+        join(process.cwd(), ".gsd", "agent-instructions.md"),
+    ];
+    for (const p of paths) {
+        if (existsSync(p)) {
+            console.warn(`[GSD] DEPRECATED: ${p} is no longer loaded. ` +
+                `Migrate your instructions to AGENTS.md (or CLAUDE.md) in the same directory. ` +
+                `See https://github.com/gsd-build/GSD-2/issues/1492`);
         }
-        catch { /* non-fatal — skip unreadable file */ }
     }
-    if (parts.length === 0)
-        return null;
-    return parts.join("\n\n");
 }
 // ── Depth verification state ──────────────────────────────────────────────
 let depthVerificationDone = false;
@@ -589,12 +577,8 @@ export default function (pi) {
                 newSkillsBlock = formatSkillsXml(newSkills);
             }
         }
-        // Load agent instructions (global + project)
-        let agentInstructionsBlock = "";
-        const agentInstructions = loadAgentInstructions();
-        if (agentInstructions) {
-            agentInstructionsBlock = `\n\n## Agent Instructions\n\nThe following instructions were provided by the user and must be followed in every session:\n\n${agentInstructions}`;
-        }
+        // Warn if deprecated agent-instructions.md files are still present
+        warnDeprecatedAgentInstructions();
         const injection = await buildGuidedExecuteContextInjection(event.prompt, process.cwd());
         // Worktree context — override the static CWD in the system prompt
         let worktreeBlock = "";
@@ -637,7 +621,7 @@ export default function (pi) {
                 "Write every .gsd artifact in the worktree path above, never in the main project tree.",
             ].join("\n");
         }
-        const fullSystem = `${event.systemPrompt}\n\n[SYSTEM CONTEXT — GSD]\n\n${systemContent}${preferenceBlock}${agentInstructionsBlock}${knowledgeBlock}${memoryBlock}${newSkillsBlock}${worktreeBlock}`;
+        const fullSystem = `${event.systemPrompt}\n\n[SYSTEM CONTEXT — GSD]\n\n${systemContent}${preferenceBlock}${knowledgeBlock}${memoryBlock}${newSkillsBlock}${worktreeBlock}`;
         stopContextTimer({
             systemPromptSize: fullSystem.length,
             injectionSize: injection?.length ?? 0,

package/dist/resources/extensions/gsd/preferences.js

@@ -15,6 +15,7 @@ import { join } from "node:path";
 import { gsdRoot } from "./paths.js";
 import { parse as parseYaml } from "yaml";
 import { normalizeStringArray } from "../shared/mod.js";
+import { resolveProfileDefaults as _resolveProfileDefaults } from "./preferences-models.js";
 import { MODE_DEFAULTS, } from "./preferences-types.js";
 import { validatePreferences } from "./preferences-validation.js";
 import { formatSkillRef } from "./preferences-skills.js";
@@ -79,6 +80,17 @@ export function loadEffectiveGSDPreferences() {
             ...(mergedWarnings.length > 0 ? { warnings: mergedWarnings } : {}),
         };
     }
+    // Apply token-profile defaults as the lowest-priority layer so that
+    // `token_profile: budget` sets models and phase-skips automatically.
+    // Explicit user preferences always override profile defaults.
+    const profile = result.preferences.token_profile;
+    if (profile) {
+        const profileDefaults = _resolveProfileDefaults(profile);
+        result = {
+            ...result,
+            preferences: mergePreferences(profileDefaults, result.preferences),
+        };
+    }
     // Apply mode defaults as the lowest-priority layer
     if (result.preferences.mode) {
         result = {

package/dist/resources/extensions/gsd/session-lock.js

@@ -231,6 +231,14 @@ export function acquireSessionLock(basePath) {
                     stale: 1_800_000, // 30 minutes — match primary lock settings
                     update: 10_000,
                     onCompromised: () => {
+                        // Same false-positive suppression as the primary lock (#1512).
+                        // Without this, the retry path fires _lockCompromised unconditionally
+                        // on benign mtime drift (laptop sleep, heavy LLM event loop stalls).
+                        const elapsed = Date.now() - _lockAcquiredAt;
+                        if (elapsed < 1_800_000) {
+                            process.stderr.write(`[gsd] Lock heartbeat mismatch after ${Math.round(elapsed / 1000)}s — event loop stall, continuing.\n`);
+                            return;
+                        }
                         _lockCompromised = true;
                         _releaseFunction = null;
                     },
@@ -315,6 +323,25 @@ export function updateSessionLock(basePath, unitType, unitId, completedUnits, se
 export function validateSessionLock(basePath) {
     // Lock was compromised by proper-lockfile (mtime drift from sleep, stall, etc.)
     if (_lockCompromised) {
+        // Recovery gate (#1512): Before declaring the lock lost, check if the lock
+        // file still contains our PID. If it does, no other process took over — the
+        // onCompromised fired from benign mtime drift (laptop sleep, event loop stall
+        // beyond the stale window). Attempt re-acquisition instead of giving up.
+        const lp = lockPath(basePath);
+        const existing = readExistingLockData(lp);
+        if (existing && existing.pid === process.pid) {
+            // Lock file still ours — try to re-acquire the OS lock
+            try {
+                const result = acquireSessionLock(basePath);
+                if (result.acquired) {
+                    process.stderr.write(`[gsd] Lock recovered after onCompromised — lock file PID matched, re-acquired.\n`);
+                    return true;
+                }
+            }
+            catch {
+                // Re-acquisition failed — fall through to return false
+            }
+        }
         return false;
     }
     // If we have an OS-level lock, we're still the owner

package/dist/resources/skills/core-web-vitals/SKILL.md

@@ -438,4 +438,4 @@ startTransition(() => setExpensiveState(newValue));
 - [web.dev LCP](https://web.dev/articles/lcp)
 - [web.dev INP](https://web.dev/articles/inp)
 - [web.dev CLS](https://web.dev/articles/cls)
-- [Performance skill](../performance/SKILL.md)
+- [Code Optimizer skill](../code-optimizer/SKILL.md)

package/dist/resources/skills/create-gsd-extension/workflows/debug-extension.md

@@ -42,7 +42,7 @@ The file must `export default function(pi: ExtensionAPI) { ... }`.
 
 ## Step 4: Check for Common Mistakes
 
-Read `references/key-rules-gotchas.md` and verify each rule against the extension code.
+Read `../references/key-rules-gotchas.md` and verify each rule against the extension code.
 
 ## Step 5: Add Debugging
 

package/dist/resources/skills/github-workflows/SKILL.md

@@ -88,5 +88,3 @@ EVIDENCE: [output from ci_monitor.cjs]
 ## References
 
 - `references/gh/SKILL.md` — gh CLI reference
-- `scripts/ci_monitor.cjs` — CI monitoring tool
-- `scripts/ci_monitor.md` — Tool usage documentation

package/dist/resources/skills/web-quality-audit/SKILL.md

@@ -163,8 +163,6 @@ When performing an audit, structure findings as:
 ## References
 
 For detailed guidelines on specific areas:
-- [Performance Optimization](../performance/SKILL.md)
 - [Core Web Vitals](../core-web-vitals/SKILL.md)
 - [Accessibility](../accessibility/SKILL.md)
-- [SEO](../seo/SKILL.md)
 - [Best Practices](../best-practices/SKILL.md)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gsd-pi",
-  "version": "2.35.0-dev.39eee32",
+  "version": "2.35.0-dev.4bbf377",
   "description": "GSD — Get Shit Done coding agent",
   "license": "MIT",
   "repository": {

package/packages/pi-agent-core/dist/agent.d.ts

@@ -140,15 +140,23 @@ export declare class Agent {
      * Queue a steering message to interrupt the agent mid-run.
      * Delivered after current tool execution, skips remaining tools.
      */
-    steer(m: AgentMessage): void;
+    steer(m: AgentMessage, origin?: "user" | "system"): void;
     /**
      * Queue a follow-up message to be processed after the agent finishes.
      * Delivered only when agent has no more tool calls or steering messages.
      */
-    followUp(m: AgentMessage): void;
+    followUp(m: AgentMessage, origin?: "user" | "system"): void;
     clearSteeringQueue(): void;
     clearFollowUpQueue(): void;
     clearAllQueues(): void;
+    /**
+     * Drain user-origin messages from queues, leaving system messages in place.
+     * Used during abort to preserve messages the user explicitly typed.
+     */
+    drainUserMessages(): {
+        steering: AgentMessage[];
+        followUp: AgentMessage[];
+    };
     hasQueuedMessages(): boolean;
     private dequeueSteeringMessages;
     private dequeueFollowUpMessages;

package/packages/pi-agent-core/dist/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":"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"}

package/packages/pi-agent-core/dist/agent.js

@@ -145,15 +145,15 @@ export class Agent {
      * Queue a steering message to interrupt the agent mid-run.
      * Delivered after current tool execution, skips remaining tools.
      */
-    steer(m) {
-        this.steeringQueue.push(m);
+    steer(m, origin = "system") {
+        this.steeringQueue.push({ message: m, origin });
     }
     /**
      * Queue a follow-up message to be processed after the agent finishes.
      * Delivered only when agent has no more tool calls or steering messages.
      */
-    followUp(m) {
-        this.followUpQueue.push(m);
+    followUp(m, origin = "system") {
+        this.followUpQueue.push({ message: m, origin });
     }
     clearSteeringQueue() {
         this.steeringQueue = [];
@@ -165,6 +165,17 @@ export class Agent {
         this.steeringQueue = [];
         this.followUpQueue = [];
     }
+    /**
+     * Drain user-origin messages from queues, leaving system messages in place.
+     * Used during abort to preserve messages the user explicitly typed.
+     */
+    drainUserMessages() {
+        const userSteering = this.steeringQueue.filter((e) => e.origin === "user").map((e) => e.message);
+        const userFollowUp = this.followUpQueue.filter((e) => e.origin === "user").map((e) => e.message);
+        this.steeringQueue = this.steeringQueue.filter((e) => e.origin !== "user");
+        this.followUpQueue = this.followUpQueue.filter((e) => e.origin !== "user");
+        return { steering: userSteering, followUp: userFollowUp };
+    }
     hasQueuedMessages() {
         return this.steeringQueue.length > 0 || this.followUpQueue.length > 0;
     }
@@ -173,11 +184,11 @@ export class Agent {
             if (this.steeringQueue.length > 0) {
                 const first = this.steeringQueue[0];
                 this.steeringQueue = this.steeringQueue.slice(1);
-                return [first];
+                return [first.message];
             }
             return [];
         }
-        const steering = this.steeringQueue.slice();
+        const steering = this.steeringQueue.map((e) => e.message);
         this.steeringQueue = [];
         return steering;
     }
@@ -186,11 +197,11 @@ export class Agent {
             if (this.followUpQueue.length > 0) {
                 const first = this.followUpQueue[0];
                 this.followUpQueue = this.followUpQueue.slice(1);
-                return [first];
+                return [first.message];
             }
             return [];
         }
-        const followUp = this.followUpQueue.slice();
+        const followUp = this.followUpQueue.map((e) => e.message);
         this.followUpQueue = [];
         return followUp;
     }