* style(tests): normalize BDD comments from '// #given' to '// given' - Replace 4,668 Python-style BDD comments across 107 test files - Patterns changed: // #given -> // given, // #when -> // when, // #then -> // then - Also handles no-space variants: //#given -> // given * fix(rules-injector): prefer output.metadata.filePath over output.title - Extract file path resolution to dedicated output-path.ts module - Prefer metadata.filePath which contains actual file path - Fall back to output.title only when metadata unavailable - Fixes issue where rules weren't injected when tool output title was a label * feat(slashcommand): add optional user_message parameter - Add user_message optional parameter for command arguments - Model can now call: command='publish' user_message='patch' - Improves error messages with clearer format guidance - Helps LLMs understand correct parameter usage * feat(hooks): restore compaction-context-injector hook - Restore hook deleted in cbbc7bd0 for session compaction context - Injects 7 mandatory sections: User Requests, Final Goal, Work Completed, Remaining Tasks, Active Working Context, MUST NOT Do, Agent Verification State - Re-register in hooks/index.ts and main plugin entry * refactor(background-agent): split manager.ts into focused modules - Extract constants.ts for TTL values and internal types (52 lines) - Extract state.ts for TaskStateManager class (204 lines) - Extract spawner.ts for task creation logic (244 lines) - Extract result-handler.ts for completion handling (265 lines) - Reduce manager.ts from 1377 to 755 lines (45% reduction) - Maintain backward compatible exports * refactor(agents): split prometheus-prompt.ts into subdirectory - Move 1196-line prometheus-prompt.ts to prometheus/ subdirectory - Organize prompt sections into separate files for maintainability - Update agents/index.ts exports * refactor(delegate-task): split tools.ts into focused modules - Extract categories.ts for category definitions and routing - Extract executor.ts for task execution logic - Extract helpers.ts for utility functions - Extract prompt-builder.ts for prompt construction - Reduce tools.ts complexity with cleaner separation of concerns * refactor(builtin-skills): split skills.ts into individual skill files - Move each skill to dedicated file in skills/ subdirectory - Create barrel export for backward compatibility - Improve maintainability with focused skill modules * chore: update import paths and lockfile - Update prometheus import path after refactor - Update bun.lock * fix(tests): complete BDD comment normalization - Fix remaining #when/#then patterns missed by initial sed - Affected: state.test.ts, events.test.ts --------- Co-authored-by: justsisyphus <justsisyphus@users.noreply.github.com>
137 lines
4.0 KiB
TypeScript
137 lines
4.0 KiB
TypeScript
import { describe, expect, test, beforeEach, afterEach } from "bun:test"
|
|
import { existsSync, mkdirSync, rmSync, readFileSync, statSync, writeFileSync } from "node:fs"
|
|
import { join } from "node:path"
|
|
import { tmpdir } from "node:os"
|
|
import {
|
|
deleteToken,
|
|
getMcpOauthStoragePath,
|
|
listAllTokens,
|
|
listTokensByHost,
|
|
loadToken,
|
|
saveToken,
|
|
} from "./storage"
|
|
import type { OAuthTokenData } from "./storage"
|
|
|
|
describe("mcp-oauth storage", () => {
|
|
const TEST_CONFIG_DIR = join(tmpdir(), "mcp-oauth-test-" + Date.now())
|
|
let originalConfigDir: string | undefined
|
|
|
|
beforeEach(() => {
|
|
originalConfigDir = process.env.OPENCODE_CONFIG_DIR
|
|
process.env.OPENCODE_CONFIG_DIR = TEST_CONFIG_DIR
|
|
if (!existsSync(TEST_CONFIG_DIR)) {
|
|
mkdirSync(TEST_CONFIG_DIR, { recursive: true })
|
|
}
|
|
})
|
|
|
|
afterEach(() => {
|
|
if (originalConfigDir === undefined) {
|
|
delete process.env.OPENCODE_CONFIG_DIR
|
|
} else {
|
|
process.env.OPENCODE_CONFIG_DIR = originalConfigDir
|
|
}
|
|
if (existsSync(TEST_CONFIG_DIR)) {
|
|
rmSync(TEST_CONFIG_DIR, { recursive: true, force: true })
|
|
}
|
|
})
|
|
|
|
test("should save tokens with {host}/{resource} key and set 0600 permissions", () => {
|
|
// given
|
|
const token: OAuthTokenData = {
|
|
accessToken: "access-1",
|
|
refreshToken: "refresh-1",
|
|
expiresAt: 1710000000,
|
|
clientInfo: { clientId: "client-1", clientSecret: "secret-1" },
|
|
}
|
|
|
|
// when
|
|
const success = saveToken("https://example.com:443", "mcp/v1", token)
|
|
const storagePath = getMcpOauthStoragePath()
|
|
const parsed = JSON.parse(readFileSync(storagePath, "utf-8")) as Record<string, OAuthTokenData>
|
|
const mode = statSync(storagePath).mode & 0o777
|
|
|
|
// then
|
|
expect(success).toBe(true)
|
|
expect(Object.keys(parsed)).toEqual(["example.com/mcp/v1"])
|
|
expect(parsed["example.com/mcp/v1"].accessToken).toBe("access-1")
|
|
expect(mode).toBe(0o600)
|
|
})
|
|
|
|
test("should load a saved token", () => {
|
|
// given
|
|
const token: OAuthTokenData = { accessToken: "access-2", refreshToken: "refresh-2" }
|
|
saveToken("api.example.com", "resource-a", token)
|
|
|
|
// when
|
|
const loaded = loadToken("api.example.com:8443", "resource-a")
|
|
|
|
// then
|
|
expect(loaded).toEqual(token)
|
|
})
|
|
|
|
test("should delete a token", () => {
|
|
// given
|
|
const token: OAuthTokenData = { accessToken: "access-3" }
|
|
saveToken("api.example.com", "resource-b", token)
|
|
|
|
// when
|
|
const success = deleteToken("api.example.com", "resource-b")
|
|
const loaded = loadToken("api.example.com", "resource-b")
|
|
|
|
// then
|
|
expect(success).toBe(true)
|
|
expect(loaded).toBeNull()
|
|
})
|
|
|
|
test("should list tokens by host", () => {
|
|
// given
|
|
saveToken("api.example.com", "resource-a", { accessToken: "access-a" })
|
|
saveToken("api.example.com", "resource-b", { accessToken: "access-b" })
|
|
saveToken("other.example.com", "resource-c", { accessToken: "access-c" })
|
|
|
|
// when
|
|
const entries = listTokensByHost("api.example.com:5555")
|
|
|
|
// then
|
|
expect(Object.keys(entries).sort()).toEqual([
|
|
"api.example.com/resource-a",
|
|
"api.example.com/resource-b",
|
|
])
|
|
expect(entries["api.example.com/resource-a"].accessToken).toBe("access-a")
|
|
})
|
|
|
|
test("should handle missing storage file", () => {
|
|
// given
|
|
const storagePath = getMcpOauthStoragePath()
|
|
if (existsSync(storagePath)) {
|
|
rmSync(storagePath, { force: true })
|
|
}
|
|
|
|
// when
|
|
const loaded = loadToken("api.example.com", "resource-a")
|
|
const entries = listTokensByHost("api.example.com")
|
|
|
|
// then
|
|
expect(loaded).toBeNull()
|
|
expect(entries).toEqual({})
|
|
})
|
|
|
|
test("should handle invalid JSON", () => {
|
|
// given
|
|
const storagePath = getMcpOauthStoragePath()
|
|
const dir = join(storagePath, "..")
|
|
if (!existsSync(dir)) {
|
|
mkdirSync(dir, { recursive: true })
|
|
}
|
|
writeFileSync(storagePath, "{not-valid-json", "utf-8")
|
|
|
|
// when
|
|
const loaded = loadToken("api.example.com", "resource-a")
|
|
const entries = listTokensByHost("api.example.com")
|
|
|
|
// then
|
|
expect(loaded).toBeNull()
|
|
expect(entries).toEqual({})
|
|
})
|
|
})
|