@machina.ai/cell-cli 1.41.1-rc2 → 1.45.1-rc1

package/dist/src/acp/acpStdioTransport.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"acpStdioTransport.js","sourceRoot":"","sources":["../../../src/acp/acpStdioTransport.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAe,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGjD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAAc,EACd,QAAwB,EACxB,IAAa;IAEb,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,kBAAkB,EAAE,CAAC;IACvD,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,aAAa,CAAmB,CAAC;IAC/D,uEAAuE;IACvE,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAA+B,CAAC;IAE1E,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC/C,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,mBAAmB,CAC5C,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,CAAC,EACnE,MAAM,CACP,CAAC;IAEF,oEAAoE;IACpE,oEAAoE;IACpE,8DAA8D;IAC9D,MAAM,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;AAClD,CAAC"}

package/dist/src/acp/acpUtils.d.ts

@@ -0,0 +1,56 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type Config, type ToolResult, type ToolCallConfirmationDetails, Kind } from '@google/gemini-cli-core';
+import type * as acp from '@agentclientprotocol/sdk';
+import { z } from 'zod';
+import type { LoadedSettings } from '../config/settings.js';
+export declare function hasMeta(obj: unknown): obj is {
+    _meta?: Record<string, unknown>;
+};
+export declare const RequestPermissionResponseSchema: z.ZodObject<{
+    outcome: z.ZodDiscriminatedUnion<"outcome", [z.ZodObject<{
+        outcome: z.ZodLiteral<"cancelled">;
+    }, "strip", z.ZodTypeAny, {
+        outcome: "cancelled";
+    }, {
+        outcome: "cancelled";
+    }>, z.ZodObject<{
+        outcome: z.ZodLiteral<"selected">;
+        optionId: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        outcome: "selected";
+        optionId: string;
+    }, {
+        outcome: "selected";
+        optionId: string;
+    }>]>;
+}, "strip", z.ZodTypeAny, {
+    outcome: {
+        outcome: "cancelled";
+    } | {
+        outcome: "selected";
+        optionId: string;
+    };
+}, {
+    outcome: {
+        outcome: "cancelled";
+    } | {
+        outcome: "selected";
+        optionId: string;
+    };
+}>;
+export declare function toToolCallContent(toolResult: ToolResult): acp.ToolCallContent | null;
+export declare function toPermissionOptions(confirmation: ToolCallConfirmationDetails, config: Config, enablePermanentToolApproval?: boolean): acp.PermissionOption[];
+export declare function toAcpToolKind(kind: Kind): acp.ToolKind;
+export declare function buildAvailableModes(isPlanEnabled: boolean): acp.SessionMode[];
+export declare function buildAvailableModels(config: Config, settings: LoadedSettings): {
+    availableModels: Array<{
+        modelId: string;
+        name: string;
+        description?: string;
+    }>;
+    currentModelId: string;
+};

package/dist/src/acp/acpUtils.js

@@ -0,0 +1,288 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { Kind, ApprovalMode, GEMINI_MODEL_ALIAS_AUTO, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_FLASH_LITE_MODEL, PREVIEW_GEMINI_3_1_MODEL, PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL, PREVIEW_GEMINI_FLASH_MODEL, PREVIEW_GEMINI_FLASH_LITE_MODEL, getDisplayString, AuthType, ToolConfirmationOutcome, getAutoModelDescription, } from '@google/gemini-cli-core';
+import { z } from 'zod';
+export function hasMeta(obj) {
+    return typeof obj === 'object' && obj !== null && '_meta' in obj;
+}
+export const RequestPermissionResponseSchema = z.object({
+    outcome: z.discriminatedUnion('outcome', [
+        z.object({ outcome: z.literal('cancelled') }),
+        z.object({
+            outcome: z.literal('selected'),
+            optionId: z.string(),
+        }),
+    ]),
+});
+export function toToolCallContent(toolResult) {
+    if (toolResult.error?.message) {
+        throw new Error(toolResult.error.message);
+    }
+    if (toolResult.returnDisplay) {
+        if (typeof toolResult.returnDisplay === 'string') {
+            return {
+                type: 'content',
+                content: { type: 'text', text: toolResult.returnDisplay },
+            };
+        }
+        else {
+            if ('fileName' in toolResult.returnDisplay) {
+                return {
+                    type: 'diff',
+                    path: toolResult.returnDisplay.filePath ??
+                        toolResult.returnDisplay.fileName,
+                    oldText: toolResult.returnDisplay.originalContent,
+                    newText: toolResult.returnDisplay.newContent,
+                    _meta: {
+                        kind: !toolResult.returnDisplay.originalContent
+                            ? 'add'
+                            : toolResult.returnDisplay.newContent === ''
+                                ? 'delete'
+                                : 'modify',
+                    },
+                };
+            }
+            return null;
+        }
+    }
+    else {
+        return null;
+    }
+}
+const basicPermissionOptions = [
+    {
+        optionId: ToolConfirmationOutcome.ProceedOnce,
+        name: 'Allow',
+        kind: 'allow_once',
+    },
+    {
+        optionId: ToolConfirmationOutcome.Cancel,
+        name: 'Reject',
+        kind: 'reject_once',
+    },
+];
+export function toPermissionOptions(confirmation, config, enablePermanentToolApproval = false) {
+    const disableAlwaysAllow = config.getDisableAlwaysAllow();
+    const options = [];
+    if (!disableAlwaysAllow) {
+        switch (confirmation.type) {
+            case 'edit':
+                options.push({
+                    optionId: ToolConfirmationOutcome.ProceedAlways,
+                    name: 'Allow for this session',
+                    kind: 'allow_always',
+                });
+                if (enablePermanentToolApproval) {
+                    options.push({
+                        optionId: ToolConfirmationOutcome.ProceedAlwaysAndSave,
+                        name: 'Allow for this file in all future sessions',
+                        kind: 'allow_always',
+                    });
+                }
+                break;
+            case 'exec':
+                options.push({
+                    optionId: ToolConfirmationOutcome.ProceedAlways,
+                    name: 'Allow for this session',
+                    kind: 'allow_always',
+                });
+                if (enablePermanentToolApproval) {
+                    options.push({
+                        optionId: ToolConfirmationOutcome.ProceedAlwaysAndSave,
+                        name: 'Allow this command for all future sessions',
+                        kind: 'allow_always',
+                    });
+                }
+                break;
+            case 'mcp':
+                options.push({
+                    optionId: ToolConfirmationOutcome.ProceedAlwaysServer,
+                    name: 'Allow all server tools for this session',
+                    kind: 'allow_always',
+                }, {
+                    optionId: ToolConfirmationOutcome.ProceedAlwaysTool,
+                    name: 'Allow tool for this session',
+                    kind: 'allow_always',
+                });
+                if (enablePermanentToolApproval) {
+                    options.push({
+                        optionId: ToolConfirmationOutcome.ProceedAlwaysAndSave,
+                        name: 'Allow tool for all future sessions',
+                        kind: 'allow_always',
+                    });
+                }
+                break;
+            case 'info':
+                options.push({
+                    optionId: ToolConfirmationOutcome.ProceedAlways,
+                    name: 'Allow for this session',
+                    kind: 'allow_always',
+                });
+                if (enablePermanentToolApproval) {
+                    options.push({
+                        optionId: ToolConfirmationOutcome.ProceedAlwaysAndSave,
+                        name: 'Allow for all future sessions',
+                        kind: 'allow_always',
+                    });
+                }
+                break;
+            case 'ask_user':
+            case 'exit_plan_mode':
+                // askuser and exit_plan_mode don't need "always allow" options
+                break;
+            default:
+                // No "always allow" options for other types
+                break;
+        }
+    }
+    options.push(...basicPermissionOptions);
+    // Exhaustive check
+    switch (confirmation.type) {
+        case 'edit':
+        case 'exec':
+        case 'mcp':
+        case 'info':
+        case 'ask_user':
+        case 'exit_plan_mode':
+        case 'sandbox_expansion':
+            break;
+        default: {
+            const unreachable = confirmation;
+            throw new Error(`Unexpected: ${unreachable}`);
+        }
+    }
+    return options;
+}
+export function toAcpToolKind(kind) {
+    switch (kind) {
+        case Kind.Read:
+        case Kind.Edit:
+        case Kind.Execute:
+        case Kind.Search:
+        case Kind.Delete:
+        case Kind.Move:
+        case Kind.Think:
+        case Kind.Fetch:
+        case Kind.SwitchMode:
+        case Kind.Other:
+            return kind;
+        case Kind.Agent:
+            return 'think';
+        case Kind.Plan:
+        case Kind.Communicate:
+        default:
+            return 'other';
+    }
+}
+export function buildAvailableModes(isPlanEnabled) {
+    const modes = [
+        {
+            id: ApprovalMode.DEFAULT,
+            name: 'Default',
+            description: 'Prompts for approval',
+        },
+        {
+            id: ApprovalMode.AUTO_EDIT,
+            name: 'Auto Edit',
+            description: 'Auto-approves edit tools',
+        },
+        {
+            id: ApprovalMode.YOLO,
+            name: 'YOLO',
+            description: 'Auto-approves all tools',
+        },
+    ];
+    if (isPlanEnabled) {
+        modes.push({
+            id: ApprovalMode.PLAN,
+            name: 'Plan',
+            description: 'Read-only mode',
+        });
+    }
+    return modes;
+}
+export function buildAvailableModels(config, settings) {
+    const preferredModel = config.getModel() || GEMINI_MODEL_ALIAS_AUTO;
+    const shouldShowPreviewModels = config.getHasAccessToPreviewModel();
+    const useGemini31 = config.getGemini31LaunchedSync?.() ?? false;
+    const useGemini3_5Flash = config.hasGemini35FlashGAAccess?.() ?? false;
+    const selectedAuthType = settings.merged.security.auth.selectedType;
+    const useCustomToolModel = useGemini31 && selectedAuthType === AuthType.USE_GEMINI;
+    // --- DYNAMIC PATH ---
+    if (config.getExperimentalDynamicModelConfiguration?.() === true &&
+        config.getModelConfigService) {
+        const options = config.getModelConfigService().getAvailableModelOptions({
+            useGemini3_1: useGemini31,
+            useGemini3_5Flash,
+            useCustomTools: useCustomToolModel,
+            hasAccessToPreview: shouldShowPreviewModels,
+        });
+        return {
+            availableModels: options,
+            currentModelId: preferredModel,
+        };
+    }
+    // --- LEGACY PATH ---
+    const mainOptions = [
+        {
+            value: GEMINI_MODEL_ALIAS_AUTO,
+            title: getDisplayString(GEMINI_MODEL_ALIAS_AUTO),
+            description: getAutoModelDescription(shouldShowPreviewModels, useGemini31, useGemini3_5Flash),
+        },
+    ];
+    const manualOptions = [
+        {
+            value: DEFAULT_GEMINI_MODEL,
+            title: getDisplayString(DEFAULT_GEMINI_MODEL),
+        },
+        {
+            value: DEFAULT_GEMINI_FLASH_MODEL,
+            title: getDisplayString(DEFAULT_GEMINI_FLASH_MODEL),
+        },
+        {
+            value: DEFAULT_GEMINI_FLASH_LITE_MODEL,
+            title: getDisplayString(DEFAULT_GEMINI_FLASH_LITE_MODEL),
+        },
+    ];
+    if (shouldShowPreviewModels) {
+        const previewProModel = useGemini31
+            ? PREVIEW_GEMINI_3_1_MODEL
+            : PREVIEW_GEMINI_MODEL;
+        const previewProValue = useCustomToolModel
+            ? PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL
+            : previewProModel;
+        const previewOptions = [
+            {
+                value: previewProValue,
+                title: getDisplayString(previewProModel),
+            },
+            {
+                value: PREVIEW_GEMINI_FLASH_MODEL,
+                title: getDisplayString(PREVIEW_GEMINI_FLASH_MODEL),
+            },
+        ];
+        if (PREVIEW_GEMINI_FLASH_LITE_MODEL !== 'none') {
+            previewOptions.push({
+                value: PREVIEW_GEMINI_FLASH_LITE_MODEL,
+                title: getDisplayString(PREVIEW_GEMINI_FLASH_LITE_MODEL),
+            });
+        }
+        manualOptions.unshift(...previewOptions);
+    }
+    const scaleOptions = (options) => options.map((o) => ({
+        modelId: o.value,
+        name: o.title,
+        description: o.description,
+    }));
+    return {
+        availableModels: [
+            ...scaleOptions(mainOptions),
+            ...scaleOptions(manualOptions),
+        ],
+        currentModelId: preferredModel,
+    };
+}
+//# sourceMappingURL=acpUtils.js.map

package/dist/src/acp/acpUtils.js.map

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

package/dist/src/acp/commands/commandRegistry.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import type { Command } from './types.js';

package/dist/src/acp/commands/commandRegistry.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { debugLogger } from '@google/gemini-cli-core';

package/dist/src/acp/commands/extensions.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import type { Command, CommandContext, CommandExecutionResponse } from './types.js';

package/dist/src/acp/commands/extensions.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { listExtensions, getErrorMessage, } from '@google/gemini-cli-core';

package/dist/src/acp/commands/extensions.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/acp/commands/extensions.test.js

@@ -0,0 +1,70 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { DisableExtensionCommand, UninstallExtensionCommand, } from './extensions.js';
+import { ExtensionManager } from '../../config/extension-manager.js';
+const mockGetErrorMessage = vi.hoisted(() => vi.fn());
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        getErrorMessage: mockGetErrorMessage,
+    };
+});
+vi.mock('../../config/extension-manager.js', () => {
+    class MockExtensionManager {
+        disableExtension = vi.fn(async () => undefined);
+        uninstallExtension = vi.fn(async () => undefined);
+        getExtensions = vi.fn(() => []);
+    }
+    return {
+        ExtensionManager: MockExtensionManager,
+        inferInstallMetadata: vi.fn(),
+    };
+});
+function createExtensionManager() {
+    return new ExtensionManager({});
+}
+function createContext(extensionLoader) {
+    return {
+        agentContext: {
+            config: {
+                getExtensionLoader: vi.fn().mockReturnValue(extensionLoader),
+            },
+        },
+        settings: {},
+        sendMessage: vi.fn().mockResolvedValue(undefined),
+    };
+}
+describe('ACP extensions error paths', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        mockGetErrorMessage.mockImplementation((error) => error instanceof Error ? error.message : String(error));
+    });
+    it('returns error when disabling fails', async () => {
+        const command = new DisableExtensionCommand();
+        const extensionManager = createExtensionManager();
+        extensionManager.disableExtension.mockRejectedValue(new Error('Extension not found.'));
+        const context = createContext(extensionManager);
+        const result = await command.execute(context, ['missing-ext']);
+        expect(result).toEqual({
+            name: 'extensions disable',
+            data: 'Failed to disable "missing-ext": Extension not found.',
+        });
+    });
+    it('returns error when uninstalling a non-existent extension', async () => {
+        const command = new UninstallExtensionCommand();
+        const extensionManager = createExtensionManager();
+        extensionManager.uninstallExtension.mockRejectedValue(new Error('Extension not found.'));
+        const context = createContext(extensionManager);
+        const result = await command.execute(context, ['non-existent-ext']);
+        expect(result).toEqual({
+            name: 'extensions uninstall',
+            data: 'Failed to uninstall extension "non-existent-ext": Extension not found.',
+        });
+    });
+});
+//# sourceMappingURL=extensions.test.js.map

package/dist/src/acp/commands/extensions.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"extensions.test.js","sourceRoot":"","sources":["../../../../src/acp/commands/extensions.test.ts"],"names":[],"mappings":"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"}

package/dist/src/acp/commands/init.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import type { Command, CommandContext, CommandExecutionResponse } from './types.js';

package/dist/src/acp/commands/init.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import * as fs from 'node:fs';

package/dist/src/acp/commands/memory.d.ts

@@ -1,13 +1,13 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import type { Command, CommandContext, CommandExecutionResponse } from './types.js';
 export declare class MemoryCommand implements Command {
     readonly name = "memory";
     readonly description = "Manage memory.";
-    readonly subCommands: (ShowMemoryCommand | RefreshMemoryCommand | ListMemoryCommand | AddMemoryCommand | InboxMemoryCommand)[];
+    readonly subCommands: (ShowMemoryCommand | RefreshMemoryCommand | ListMemoryCommand | InboxMemoryCommand)[];
     readonly requiresWorkspace = true;
     execute(context: CommandContext, _: string[]): Promise<CommandExecutionResponse>;
 }
@@ -27,13 +27,8 @@ export declare class ListMemoryCommand implements Command {
     readonly description = "Lists the paths of the GEMINI.md files in use.";
     execute(context: CommandContext, _: string[]): Promise<CommandExecutionResponse>;
 }
-export declare class AddMemoryCommand implements Command {
-    readonly name = "memory add";
-    readonly description = "Add content to the memory.";
-    execute(context: CommandContext, args: string[]): Promise<CommandExecutionResponse>;
-}
 export declare class InboxMemoryCommand implements Command {
     readonly name = "memory inbox";
-    readonly description = "Lists skills extracted from past sessions that are pending review.";
+    readonly description = "Lists memory items extracted from past sessions that are pending review.";
     execute(context: CommandContext, _: string[]): Promise<CommandExecutionResponse>;
 }

package/dist/src/acp/commands/memory.js

@@ -1,14 +1,9 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { addMemory, listInboxSkills, listInboxPatches, listMemoryFiles, refreshMemory, showMemory, } from '@google/gemini-cli-core';
-const DEFAULT_SANITIZATION_CONFIG = {
-    allowedEnvironmentVariables: [],
-    blockedEnvironmentVariables: [],
-    enableEnvironmentVariableRedaction: false,
-};
+import { listInboxMemoryPatches, listInboxSkills, listInboxPatches, listMemoryFiles, refreshMemory, showMemory, } from '@google/gemini-cli-core';
 export class MemoryCommand {
     name = 'memory';
     description = 'Manage memory.';
@@ -16,7 +11,6 @@ export class MemoryCommand {
         new ShowMemoryCommand(),
         new RefreshMemoryCommand(),
         new ListMemoryCommand(),
-        new AddMemoryCommand(),
         new InboxMemoryCommand(),
     ];
     requiresWorkspace = true;
@@ -49,44 +43,9 @@ export class ListMemoryCommand {
         return { name: this.name, data: result.content };
     }
 }
-export class AddMemoryCommand {
-    name = 'memory add';
-    description = 'Add content to the memory.';
-    async execute(context, args) {
-        const textToAdd = args.join(' ').trim();
-        const result = addMemory(textToAdd);
-        if (result.type === 'message') {
-            return { name: this.name, data: result.content };
-        }
-        const toolRegistry = context.agentContext.toolRegistry;
-        const tool = toolRegistry.getTool(result.toolName);
-        if (tool) {
-            const abortController = new AbortController();
-            const signal = abortController.signal;
-            await context.sendMessage(`Saving memory via ${result.toolName}...`);
-            await tool.buildAndExecute(result.toolArgs, signal, undefined, {
-                shellExecutionConfig: {
-                    sanitizationConfig: DEFAULT_SANITIZATION_CONFIG,
-                    sandboxManager: context.agentContext.sandboxManager,
-                },
-            });
-            await refreshMemory(context.agentContext.config);
-            return {
-                name: this.name,
-                data: `Added memory: "${textToAdd}"`,
-            };
-        }
-        else {
-            return {
-                name: this.name,
-                data: `Error: Tool ${result.toolName} not found.`,
-            };
-        }
-    }
-}
 export class InboxMemoryCommand {
     name = 'memory inbox';
-    description = 'Lists skills extracted from past sessions that are pending review.';
+    description = 'Lists memory items extracted from past sessions that are pending review.';
     async execute(context, _) {
         if (!context.agentContext.config.isAutoMemoryEnabled()) {
             return {
@@ -94,11 +53,14 @@ export class InboxMemoryCommand {
                 data: 'The memory inbox requires Auto Memory. Enable it with: experimental.autoMemory = true in settings.',
             };
         }
-        const [skills, patches] = await Promise.all([
+        const [skills, patches, memoryPatches] = await Promise.all([
             listInboxSkills(context.agentContext.config),
             listInboxPatches(context.agentContext.config),
+            listInboxMemoryPatches(context.agentContext.config),
         ]);
-        if (skills.length === 0 && patches.length === 0) {
+        if (skills.length === 0 &&
+            patches.length === 0 &&
+            memoryPatches.length === 0) {
             return { name: this.name, data: 'No items in inbox.' };
         }
         const lines = [];
@@ -115,7 +77,16 @@ export class InboxMemoryCommand {
                 : '';
             lines.push(`- **${p.name}** (update): patches ${targets}${date}`);
         }
-        const total = skills.length + patches.length;
+        for (const memoryPatch of memoryPatches) {
+            const targets = memoryPatch.entries.map((e) => e.targetPath).join(', ');
+            const date = memoryPatch.extractedAt
+                ? ` (latest extract: ${new Date(memoryPatch.extractedAt).toLocaleDateString()})`
+                : '';
+            const sourceCount = memoryPatch.sourceFiles.length;
+            const sourceLabel = sourceCount === 1 ? 'patch' : 'patches';
+            lines.push(`- **${memoryPatch.name}** (${sourceCount} source ${sourceLabel}, ${memoryPatch.entries.length} hunks): targets ${targets}${date}`);
+        }
+        const total = skills.length + patches.length + memoryPatches.length;
         return {
             name: this.name,
             data: `Memory inbox (${total}):\n${lines.join('\n')}`,