Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,11 @@ function migrateConfig(config: JsonObject): { changed: boolean; config: JsonObje

const summary = fixedRoleConfig(migratedView, "summary");
const evolution = fixedRoleConfig(migratedView, "evolution");
if (summary) memmyMemory.summary = structuredClone(summary);
if (summary) {
const migratedSummary = structuredClone(summary);
if (migratedSummary.timeoutMs === 45_000) migratedSummary.timeoutMs = 180_000;
memmyMemory.summary = migratedSummary;
}
if (evolution) memmyMemory.evolution = structuredClone(evolution);
memmyMemory.embedding = mergeEmbedding(migratedView);
migrateUserIds(migrated, memmyMemory, migratedView);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
import {
mutateRuntimeConfig,
mutateRuntimeConfigLockHeld,
type RuntimeConfigDocument,
} from "../../runtime-config-writer.js";
import {
MigrationError,
type AgentWorkspaceMigrationContext,
type MigrationDefinition,
type MigrationResult,
} from "../../types.js";

const MIGRATION_ID = "v1.1.2/0001-upgrade-summary-timeout";
const LEGACY_SUMMARY_TIMEOUT_MS = 45_000;
const SUMMARY_TIMEOUT_MS = 180_000;

function isObject(value: unknown): value is RuntimeConfigDocument {
return typeof value === "object" && value !== null && !Array.isArray(value);
}

function upgradeSummaryTimeout(config: RuntimeConfigDocument): void {
const memory = isObject(config.memmyMemory) ? config.memmyMemory : null;
const summary = memory && isObject(memory.summary) ? memory.summary : null;
if (summary?.timeoutMs === LEGACY_SUMMARY_TIMEOUT_MS) {
summary.timeoutMs = SUMMARY_TIMEOUT_MS;
}
}

function wrapError(error: unknown): never {
if (error instanceof MigrationError) {
throw new MigrationError(error.code, error.message, {
migrationId: MIGRATION_ID,
scope: "runtime-config",
cause: error.cause,
});
}
throw new MigrationError("migration_config_invalid", "Unable to upgrade the memory summary timeout", {
migrationId: MIGRATION_ID,
scope: "runtime-config",
cause: error,
});
}

async function runSummaryTimeoutMigration(
context: AgentWorkspaceMigrationContext,
): Promise<MigrationResult> {
try {
const options = { createIfMissing: false as const };
const result = context.runtimeConfigLock
? await mutateRuntimeConfigLockHeld(context.runtimeConfigLock, upgradeSummaryTimeout, options)
: await mutateRuntimeConfig(context.runtimeConfigFile, upgradeSummaryTimeout, options);
if (!result.sourceExists) {
return { scanned: 0, changed: 0, ignored: 0, deferred: true };
}
return result.changed
? { scanned: 1, changed: 1, ignored: 0 }
: { scanned: 1, changed: 0, ignored: 1 };
} catch (error) {
wrapError(error);
}
}

export const upgradeSummaryTimeoutV112: MigrationDefinition = {
id: MIGRATION_ID,
introducedIn: "1.1.2",
scope: "runtime-config",
description: "Upgrade the legacy 45-second memory summary timeout to 180 seconds",
up: runSummaryTimeoutMigration,
};
2 changes: 2 additions & 0 deletions Migrations/src/registry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { importLegacyAppStateModelConfigV107 } from "./migrations/v1.0.7/0002-im
import { normalizeGoalStateV107 } from "./migrations/v1.0.7/0003-normalize-goal-state.js";
import { addGoalDagBoundaryV107 } from "./migrations/v1.0.7/0004-add-goal-dag-boundary.js";
import { repairRuntimeModelCatalogV109 } from "./migrations/v1.0.9/0001-repair-runtime-model-catalog.js";
import { upgradeSummaryTimeoutV112 } from "./migrations/v1.1.2/0001-upgrade-summary-timeout.js";
import { MigrationError, type MigrationDefinition } from "./types.js";

const STABLE_SEMVER_PATTERN =
Expand All @@ -24,6 +25,7 @@ export const migrations: readonly MigrationDefinition[] = [
normalizeGoalStateV107,
addGoalDagBoundaryV107,
repairRuntimeModelCatalogV109,
upgradeSummaryTimeoutV112,
];

function definitionError(message: string, migrationId: string | null = null): never {
Expand Down
69 changes: 69 additions & 0 deletions Migrations/tests/0001-upgrade-summary-timeout.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
import fs from "node:fs/promises";
import os from "node:os";
import path from "node:path";
import YAML from "yaml";
import { afterEach, describe, expect, it, vi } from "vitest";
import { upgradeSummaryTimeoutV112 } from "../src/migrations/v1.1.2/0001-upgrade-summary-timeout.js";
import type { MigrationLogger } from "../src/types.js";

const temporaryDirectories: string[] = [];

function logger(): MigrationLogger {
return { info: vi.fn(), warn: vi.fn(), error: vi.fn() };
}

async function fixture(config: unknown) {
const root = await fs.mkdtemp(path.join(os.tmpdir(), "memmy-summary-timeout-migration-"));
temporaryDirectories.push(root);
const configPath = path.join(root, "config.yaml");
await fs.writeFile(configPath, YAML.stringify(config), "utf8");
return { root, configPath };
}

afterEach(async () => {
await Promise.all(
temporaryDirectories.splice(0).map((directory) =>
fs.rm(directory, { recursive: true, force: true }),
),
);
});

describe("v1.1.2/0001-upgrade-summary-timeout", () => {
it("upgrades the legacy 45-second summary timeout to 180 seconds", async () => {
const { root, configPath } = await fixture({
memmyMemory: {
summary: { model: "gpt-main", timeoutMs: 45_000 },
evolution: { timeoutMs: 45_000 },
},
});

await expect(upgradeSummaryTimeoutV112.up({
profileWorkspace: root,
sessionsDir: path.join(root, "sessions"),
runtimeConfigFile: configPath,
sessionDagDir: path.join(root, "session-dag"),
logger: logger(),
})).resolves.toEqual({ scanned: 1, changed: 1, ignored: 0 });

const config = YAML.parse(await fs.readFile(configPath, "utf8"));
expect(config.memmyMemory.summary).toEqual({ model: "gpt-main", timeoutMs: 180_000 });
expect(config.memmyMemory.evolution.timeoutMs).toBe(45_000);
});

it("preserves a user-defined summary timeout", async () => {
const { root, configPath } = await fixture({
memmyMemory: { summary: { timeoutMs: 90_000 } },
});

await expect(upgradeSummaryTimeoutV112.up({
profileWorkspace: root,
sessionsDir: path.join(root, "sessions"),
runtimeConfigFile: configPath,
sessionDagDir: path.join(root, "session-dag"),
logger: logger(),
})).resolves.toEqual({ scanned: 1, changed: 0, ignored: 1 });

const config = YAML.parse(await fs.readFile(configPath, "utf8"));
expect(config.memmyMemory.summary.timeoutMs).toBe(90_000);
});
});
2 changes: 1 addition & 1 deletion Migrations/tests/legacy-memory-model-config.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ describe("legacy Memory model config normalization", () => {
});
expect(config.memmyMemory.summary).toMatchObject({
model: "gpt-main",
timeoutMs: 45_000,
timeoutMs: 180_000,
});
expect(config.memmyMemory.evolution).toMatchObject({
model: "claude-fixed",
Expand Down
13 changes: 12 additions & 1 deletion Migrations/tests/runner.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,10 @@ describe("migration runner", () => {
"v1.0.7/0003-normalize-goal-state",
"v1.0.7/0004-add-goal-dag-boundary",
"v1.0.9/0001-repair-runtime-model-catalog",
"v1.1.2/0001-upgrade-summary-timeout",
]);
expect(first.deferred).toEqual(["v1.0.7/0002-import-legacy-app-state-model-config"]);
expect(first.results).toEqual({ scanned: 4, changed: 2, ignored: 2 });
expect(first.results).toEqual({ scanned: 5, changed: 2, ignored: 3 });
expect(second).toEqual({
applied: [],
skipped: [
Expand All @@ -122,6 +123,7 @@ describe("migration runner", () => {
"v1.0.7/0003-normalize-goal-state",
"v1.0.7/0004-add-goal-dag-boundary",
"v1.0.9/0001-repair-runtime-model-catalog",
"v1.1.2/0001-upgrade-summary-timeout",
],
deferred: ["v1.0.7/0002-import-legacy-app-state-model-config"],
results: { scanned: 0, changed: 0, ignored: 0 },
Expand Down Expand Up @@ -172,6 +174,15 @@ describe("migration runner", () => {
key: runtimeConfigTargetKey(configPath),
},
},
{
id: "v1.1.2/0001-upgrade-summary-timeout",
introducedIn: "1.1.2",
appliedAt: expect.stringMatching(/Z$/),
target: {
type: "runtime-config",
key: runtimeConfigTargetKey(configPath),
},
},
]);
});

Expand Down
Loading