gsd-pi 2.35.0 → 2.36.0-dev.d612764

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

@@ -20,9 +20,12 @@ import { StringEnum } from "@gsd/pi-ai";
 import { getMarkdownTheme } from "@gsd/pi-coding-agent";
 import { Container, Markdown, Spacer, Text } from "@gsd/pi-tui";
 import { Type } from "@sinclair/typebox";
+import { formatTokenCount } from "../shared/mod.js";
 import { discoverAgents } from "./agents.js";
 import { createIsolation, mergeDeltaPatches, readIsolationMode, } from "./isolation.js";
 import { registerWorker, updateWorker } from "./worker-registry.js";
+import { loadEffectiveGSDPreferences } from "../gsd/preferences.js";
+import { CmuxClient, shellEscape } from "../cmux/index.js";
 const MAX_PARALLEL_TASKS = 8;
 const MAX_CONCURRENCY = 4;
 const COLLAPSED_ITEM_COUNT = 10;
@@ -58,31 +61,22 @@ async function stopLiveSubagents() {
         }
     }
 }
-function formatTokens(count) {
-    if (count < 1000)
-        return count.toString();
-    if (count < 10000)
-        return `${(count / 1000).toFixed(1)}k`;
-    if (count < 1000000)
-        return `${Math.round(count / 1000)}k`;
-    return `${(count / 1000000).toFixed(1)}M`;
-}
 function formatUsageStats(usage, model) {
     const parts = [];
     if (usage.turns)
         parts.push(`${usage.turns} turn${usage.turns > 1 ? "s" : ""}`);
     if (usage.input)
-        parts.push(`↑${formatTokens(usage.input)}`);
+        parts.push(`↑${formatTokenCount(usage.input)}`);
     if (usage.output)
-        parts.push(`↓${formatTokens(usage.output)}`);
+        parts.push(`↓${formatTokenCount(usage.output)}`);
     if (usage.cacheRead)
-        parts.push(`R${formatTokens(usage.cacheRead)}`);
+        parts.push(`R${formatTokenCount(usage.cacheRead)}`);
     if (usage.cacheWrite)
-        parts.push(`W${formatTokens(usage.cacheWrite)}`);
+        parts.push(`W${formatTokenCount(usage.cacheWrite)}`);
     if (usage.cost)
         parts.push(`$${(Number(usage.cost) || 0).toFixed(4)}`);
     if (usage.contextTokens && usage.contextTokens > 0) {
-        parts.push(`ctx:${formatTokens(usage.contextTokens)}`);
+        parts.push(`ctx:${formatTokenCount(usage.contextTokens)}`);
     }
     if (model)
         parts.push(model);
@@ -199,6 +193,66 @@ function writePromptToTempFile(agentName, prompt) {
     fs.writeFileSync(filePath, prompt, { encoding: "utf-8", mode: 0o600 });
     return { dir: tmpDir, filePath };
 }
+function buildSubagentProcessArgs(agent, task, tmpPromptPath) {
+    const args = ["--mode", "json", "-p", "--no-session"];
+    if (agent.model)
+        args.push("--model", agent.model);
+    if (agent.tools && agent.tools.length > 0)
+        args.push("--tools", agent.tools.join(","));
+    if (tmpPromptPath)
+        args.push("--append-system-prompt", tmpPromptPath);
+    args.push(`Task: ${task}`);
+    return args;
+}
+function processSubagentEventLine(line, currentResult, emitUpdate) {
+    if (!line.trim())
+        return;
+    let event;
+    try {
+        event = JSON.parse(line);
+    }
+    catch {
+        return;
+    }
+    if (event.type === "message_end" && event.message) {
+        const msg = event.message;
+        currentResult.messages.push(msg);
+        if (msg.role === "assistant") {
+            currentResult.usage.turns++;
+            const usage = msg.usage;
+            if (usage) {
+                currentResult.usage.input += usage.input || 0;
+                currentResult.usage.output += usage.output || 0;
+                currentResult.usage.cacheRead += usage.cacheRead || 0;
+                currentResult.usage.cacheWrite += usage.cacheWrite || 0;
+                currentResult.usage.cost += usage.cost?.total || 0;
+                currentResult.usage.contextTokens = usage.totalTokens || 0;
+            }
+            if (!currentResult.model && msg.model)
+                currentResult.model = msg.model;
+            if (msg.stopReason)
+                currentResult.stopReason = msg.stopReason;
+            if (msg.errorMessage)
+                currentResult.errorMessage = msg.errorMessage;
+        }
+        emitUpdate();
+    }
+    if (event.type === "tool_result_end" && event.message) {
+        currentResult.messages.push(event.message);
+        emitUpdate();
+    }
+}
+async function waitForFile(filePath, signal, timeoutMs = 30 * 60 * 1000) {
+    const started = Date.now();
+    while (Date.now() - started < timeoutMs) {
+        if (signal?.aborted)
+            return false;
+        if (fs.existsSync(filePath))
+            return true;
+        await new Promise((resolve) => setTimeout(resolve, 150));
+    }
+    return false;
+}
 async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, signal, onUpdate, makeDetails) {
     const agent = agents.find((a) => a.name === agentName);
     if (!agent) {
@@ -214,11 +268,6 @@ async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, si
             step,
         };
     }
-    const args = ["--mode", "json", "-p", "--no-session"];
-    if (agent.model)
-        args.push("--model", agent.model);
-    if (agent.tools && agent.tools.length > 0)
-        args.push("--tools", agent.tools.join(","));
     let tmpPromptDir = null;
     let tmpPromptPath = null;
     const currentResult = {
@@ -245,9 +294,8 @@ async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, si
             const tmp = writePromptToTempFile(agent.name, agent.systemPrompt);
             tmpPromptDir = tmp.dir;
             tmpPromptPath = tmp.filePath;
-            args.push("--append-system-prompt", tmpPromptPath);
         }
-        args.push(`Task: ${task}`);
+        const args = buildSubagentProcessArgs(agent, task, tmpPromptPath);
         let wasAborted = false;
         const exitCode = await new Promise((resolve) => {
             const bundledPaths = (process.env.GSD_BUNDLED_EXTENSION_PATHS ?? "").split(path.delimiter).map(s => s.trim()).filter(Boolean);
@@ -255,50 +303,12 @@ async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, si
             const proc = spawn(process.execPath, [process.env.GSD_BIN_PATH, ...extensionArgs, ...args], { cwd: cwd ?? defaultCwd, shell: false, stdio: ["ignore", "pipe", "pipe"] });
             liveSubagentProcesses.add(proc);
             let buffer = "";
-            const processLine = (line) => {
-                if (!line.trim())
-                    return;
-                let event;
-                try {
-                    event = JSON.parse(line);
-                }
-                catch {
-                    return;
-                }
-                if (event.type === "message_end" && event.message) {
-                    const msg = event.message;
-                    currentResult.messages.push(msg);
-                    if (msg.role === "assistant") {
-                        currentResult.usage.turns++;
-                        const usage = msg.usage;
-                        if (usage) {
-                            currentResult.usage.input += usage.input || 0;
-                            currentResult.usage.output += usage.output || 0;
-                            currentResult.usage.cacheRead += usage.cacheRead || 0;
-                            currentResult.usage.cacheWrite += usage.cacheWrite || 0;
-                            currentResult.usage.cost += usage.cost?.total || 0;
-                            currentResult.usage.contextTokens = usage.totalTokens || 0;
-                        }
-                        if (!currentResult.model && msg.model)
-                            currentResult.model = msg.model;
-                        if (msg.stopReason)
-                            currentResult.stopReason = msg.stopReason;
-                        if (msg.errorMessage)
-                            currentResult.errorMessage = msg.errorMessage;
-                    }
-                    emitUpdate();
-                }
-                if (event.type === "tool_result_end" && event.message) {
-                    currentResult.messages.push(event.message);
-                    emitUpdate();
-                }
-            };
             proc.stdout.on("data", (data) => {
                 buffer += data.toString();
                 const lines = buffer.split("\n");
                 buffer = lines.pop() || "";
                 for (const line of lines)
-                    processLine(line);
+                    processSubagentEventLine(line, currentResult, emitUpdate);
             });
             proc.stderr.on("data", (data) => {
                 currentResult.stderr += data.toString();
@@ -306,7 +316,7 @@ async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, si
             proc.on("close", (code) => {
                 liveSubagentProcesses.delete(proc);
                 if (buffer.trim())
-                    processLine(buffer);
+                    processSubagentEventLine(buffer, currentResult, emitUpdate);
                 resolve(code ?? 0);
             });
             proc.on("error", () => {
@@ -350,6 +360,103 @@ async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, si
             }
     }
 }
+async function runSingleAgentInCmuxSplit(cmuxClient, direction, defaultCwd, agents, agentName, task, cwd, step, signal, onUpdate, makeDetails) {
+    const agent = agents.find((a) => a.name === agentName);
+    if (!agent) {
+        return runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, signal, onUpdate, makeDetails);
+    }
+    let tmpPromptDir = null;
+    let tmpPromptPath = null;
+    let tmpOutputDir = null;
+    const currentResult = {
+        agent: agentName,
+        agentSource: agent.source,
+        task,
+        exitCode: 0,
+        messages: [],
+        stderr: "",
+        usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, contextTokens: 0, turns: 0 },
+        model: agent.model,
+        step,
+    };
+    const emitUpdate = () => {
+        if (onUpdate) {
+            onUpdate({
+                content: [{ type: "text", text: getFinalOutput(currentResult.messages) || "(running...)" }],
+                details: makeDetails([currentResult]),
+            });
+        }
+    };
+    try {
+        if (agent.systemPrompt.trim()) {
+            const tmp = writePromptToTempFile(agent.name, agent.systemPrompt);
+            tmpPromptDir = tmp.dir;
+            tmpPromptPath = tmp.filePath;
+        }
+        tmpOutputDir = fs.mkdtempSync(path.join(os.tmpdir(), "pi-subagent-cmux-"));
+        const stdoutPath = path.join(tmpOutputDir, "stdout.jsonl");
+        const stderrPath = path.join(tmpOutputDir, "stderr.log");
+        const exitPath = path.join(tmpOutputDir, "exit.code");
+        const cmuxSurfaceId = await cmuxClient.createSplit(direction);
+        if (!cmuxSurfaceId) {
+            return runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, signal, onUpdate, makeDetails);
+        }
+        const bundledPaths = (process.env.GSD_BUNDLED_EXTENSION_PATHS ?? "").split(path.delimiter).map((s) => s.trim()).filter(Boolean);
+        const extensionArgs = bundledPaths.flatMap((p) => ["--extension", p]);
+        const processArgs = [process.env.GSD_BIN_PATH, ...extensionArgs, ...buildSubagentProcessArgs(agent, task, tmpPromptPath)];
+        const innerScript = [
+            `cd ${shellEscape(cwd ?? defaultCwd)}`,
+            "set -o pipefail",
+            `${shellEscape(process.execPath)} ${processArgs.map(shellEscape).join(" ")} 2> >(tee ${shellEscape(stderrPath)} >&2) | tee ${shellEscape(stdoutPath)}`,
+            "status=${PIPESTATUS[0]}",
+            `printf '%s' "$status" > ${shellEscape(exitPath)}`,
+        ].join("; ");
+        const sent = await cmuxClient.sendSurface(cmuxSurfaceId, `bash -lc ${shellEscape(innerScript)}`);
+        if (!sent) {
+            return runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, signal, onUpdate, makeDetails);
+        }
+        const finished = await waitForFile(exitPath, signal);
+        if (!finished) {
+            currentResult.exitCode = 1;
+            currentResult.stderr = "cmux split execution timed out or was aborted";
+            return currentResult;
+        }
+        if (fs.existsSync(stdoutPath)) {
+            const stdout = fs.readFileSync(stdoutPath, "utf-8");
+            for (const line of stdout.split("\n")) {
+                processSubagentEventLine(line, currentResult, emitUpdate);
+            }
+        }
+        if (fs.existsSync(stderrPath)) {
+            currentResult.stderr = fs.readFileSync(stderrPath, "utf-8");
+        }
+        currentResult.exitCode = Number.parseInt(fs.readFileSync(exitPath, "utf-8").trim() || "1", 10) || 0;
+        return currentResult;
+    }
+    finally {
+        if (tmpPromptPath)
+            try {
+                fs.unlinkSync(tmpPromptPath);
+            }
+            catch {
+                /* ignore */
+            }
+        if (tmpPromptDir)
+            try {
+                fs.rmdirSync(tmpPromptDir);
+            }
+            catch {
+                /* ignore */
+            }
+        if (tmpOutputDir)
+            try {
+                fs.rmSync(tmpOutputDir, { recursive: true, force: true });
+            }
+            catch {
+                /* ignore */
+            }
+    }
+}
 const TaskItem = Type.Object({
     agent: Type.String({ description: "Name of the agent to invoke" }),
     task: Type.String({ description: "Task to delegate to the agent" }),
@@ -420,6 +527,8 @@ export default function (pi) {
             const discovery = discoverAgents(ctx.cwd, agentScope);
             const agents = discovery.agents;
             const confirmProjectAgents = params.confirmProjectAgents ?? false;
+            const cmuxClient = CmuxClient.fromPreferences(loadEffectiveGSDPreferences()?.preferences);
+            const cmuxSplitsEnabled = cmuxClient.getConfig().splits;
             // Resolve isolation mode
             const isolationMode = readIsolationMode();
             const useIsolation = Boolean(params.isolated) && isolationMode !== "none";
@@ -549,23 +658,24 @@ export default function (pi) {
                 const batchSize = params.tasks.length;
                 const results = await mapWithConcurrencyLimit(params.tasks, MAX_CONCURRENCY, async (t, index) => {
                     const workerId = registerWorker(t.agent, t.task, index, batchSize, batchId);
-                    let result = await runSingleAgent(ctx.cwd, agents, t.agent, t.task, t.cwd, undefined, signal, 
-                    // Per-task update callback
-                    (partial) => {
-                        if (partial.details?.results[0]) {
-                            allResults[index] = partial.details.results[0];
-                            emitParallelUpdate();
-                        }
-                    }, makeDetails("parallel"));
-                    // Auto-retry failed tasks (likely API rate limit or transient error)
-                    const isFailed = result.exitCode !== 0 || (result.messages.length === 0 && !signal?.aborted);
-                    if (isFailed && MAX_RETRIES > 0 && !signal?.aborted) {
-                        result = await runSingleAgent(ctx.cwd, agents, t.agent, t.task, t.cwd, undefined, signal, (partial) => {
+                    const runTask = () => cmuxSplitsEnabled
+                        ? runSingleAgentInCmuxSplit(cmuxClient, index % 2 === 0 ? "right" : "down", ctx.cwd, agents, t.agent, t.task, t.cwd, undefined, signal, (partial) => {
+                            if (partial.details?.results[0]) {
+                                allResults[index] = partial.details.results[0];
+                                emitParallelUpdate();
+                            }
+                        }, makeDetails("parallel"))
+                        : runSingleAgent(ctx.cwd, agents, t.agent, t.task, t.cwd, undefined, signal, (partial) => {
                             if (partial.details?.results[0]) {
                                 allResults[index] = partial.details.results[0];
                                 emitParallelUpdate();
                             }
                         }, makeDetails("parallel"));
+                    let result = await runTask();
+                    // Auto-retry failed tasks (likely API rate limit or transient error)
+                    const isFailed = result.exitCode !== 0 || (result.messages.length === 0 && !signal?.aborted);
+                    if (isFailed && MAX_RETRIES > 0 && !signal?.aborted) {
+                        result = await runTask();
                     }
                     updateWorker(workerId, result.exitCode === 0 ? "completed" : "failed");
                     allResults[index] = result;
@@ -599,7 +709,9 @@ export default function (pi) {
                         const taskId = crypto.randomUUID();
                         isolation = await createIsolation(effectiveCwd, taskId, isolationMode);
                     }
-                    const result = await runSingleAgent(ctx.cwd, agents, params.agent, params.task, isolation ? isolation.workDir : params.cwd, undefined, signal, onUpdate, makeDetails("single"));
+                    const result = cmuxSplitsEnabled
+                        ? await runSingleAgentInCmuxSplit(cmuxClient, "right", ctx.cwd, agents, params.agent, params.task, isolation ? isolation.workDir : params.cwd, undefined, signal, onUpdate, makeDetails("single"))
+                        : await runSingleAgent(ctx.cwd, agents, params.agent, params.task, isolation ? isolation.workDir : params.cwd, undefined, signal, onUpdate, makeDetails("single"));
                     // Capture and merge delta if isolated
                     if (isolation) {
                         const patches = await isolation.captureDelta();

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",
+  "version": "2.36.0-dev.d612764",
   "description": "GSD — Get Shit Done coding agent",
   "license": "MIT",
   "repository": {
@@ -50,6 +50,7 @@
     "copy-themes": "node scripts/copy-themes.cjs",
     "copy-export-html": "node scripts/copy-export-html.cjs",
     "test:unit": "node --import ./src/resources/extensions/gsd/tests/resolve-ts.mjs --experimental-strip-types --test src/resources/extensions/gsd/tests/*.test.ts src/resources/extensions/gsd/tests/*.test.mjs src/tests/*.test.ts",
+    "test:marketplace": "GSD_TEST_CLONE_MARKETPLACES=1 node --import ./src/resources/extensions/gsd/tests/resolve-ts.mjs --experimental-strip-types --test src/resources/extensions/gsd/tests/claude-import-tui.test.ts src/resources/extensions/gsd/tests/plugin-importer-live.test.ts src/tests/marketplace-discovery.test.ts",
     "test:coverage": "c8 --reporter=text --reporter=lcov --exclude='src/resources/extensions/gsd/tests/**' --exclude='src/tests/**' --exclude='scripts/**' --exclude='native/**' --exclude='node_modules/**' --check-coverage --statements=50 --lines=50 --branches=20 --functions=20 node --import ./src/resources/extensions/gsd/tests/resolve-ts.mjs --experimental-strip-types --test src/resources/extensions/gsd/tests/*.test.ts src/resources/extensions/gsd/tests/*.test.mjs src/tests/*.test.ts",
     "test:integration": "node --import ./src/resources/extensions/gsd/tests/resolve-ts.mjs --experimental-strip-types --test src/resources/extensions/gsd/tests/*integration*.test.ts src/tests/integration/*.test.ts",
     "test": "npm run test:unit && npm run test:integration",

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;
     }