$DSH_HOME/.env carried two incompatible jobs. As credentials-local's writable secret store it could not be hoisted into process.env — hoisting makes every stored key read as a read-only launch override and blocks rotation from the TUI and the web page. But its name and dotenv format promise an environment file, so a DEEPSEEK_BASE_URL sitting beside a working DEEPSEEK_API_KEY in the same file was silently ignored: only the credential provider read the document, and it addresses credential references alone. Split the two jobs into two files. .credentials.yaml is the provider-managed store: a strict YAML mapping of CredentialRef to non-empty string, no version field, no wrapper level. Because it holds credentials and nothing else, a non-mapping root, a non-identifier key, a non-string value, an empty string, a duplicate key, and malformed YAML are all rejections rather than skipped entries — loud at boot and at a write, warn-and-keep-last-good on a live reload. The dotenv physical-line editor gives way to a patch of the parsed document, so comments and untouched entries keep their formatting and any string value round-trips, multi-line included. Writer lock, read-modify-write, atomic 0600 write under a 0700 directory, watcher, self-write suppression, and quiescent disposal are unchanged. $DSH_HOME/.env becomes the user's ordinary environment layer. app-boot's new loadLayeredEnv loads the invoking directory's .env then the Harness home's, giving user < project < inherited; the home resolves from the inherited environment first, so a project .env cannot redirect it. Credential precedence is unchanged: the live environment still wins read-only over the file, and shadowed writes still reject. Whether a provider-managed store should instead win over the environment is a separate decision. No migration: a key already in $DSH_HOME/.env keeps resolving through the new environment layer, as a read-only env source that shadows the stored one.
147 lines
6.7 KiB
TypeScript
147 lines
6.7 KiB
TypeScript
// Third-review behaviors: read-modify-write under the writer lock (external
|
|
// edits survive an API write), the contained credentials/updated fan-out (a
|
|
// broken observer never fails a committed write), and the YAML document
|
|
// editor's isolation between entries.
|
|
import { afterEach, describe, expect, it, vi } from 'vitest'
|
|
import { Context } from 'cordis'
|
|
import { mkdtemp, readFile, rm, stat, writeFile } from 'node:fs/promises'
|
|
import { tmpdir } from 'node:os'
|
|
import { join } from 'node:path'
|
|
import { credentialRef } from '@deepseek-ai/dsh-credentials'
|
|
import { CredentialsLocal } from '../src/index.ts'
|
|
|
|
const ALPHA = credentialRef('DSH_REVIEW_ALPHA')
|
|
const BETA = credentialRef('DSH_REVIEW_BETA')
|
|
const INNER = credentialRef('DSH_REVIEW_INNER')
|
|
|
|
const cleanups: Array<() => Promise<void>> = []
|
|
|
|
afterEach(async () => {
|
|
while (cleanups.length > 0) await cleanups.pop()!()
|
|
})
|
|
|
|
async function tempDir(): Promise<string> {
|
|
const dir = await mkdtemp(join(tmpdir(), 'dsh-cred-review-'))
|
|
cleanups.push(() => rm(dir, { recursive: true, force: true }))
|
|
return dir
|
|
}
|
|
|
|
async function boot(config: ConstructorParameters<typeof CredentialsLocal>[1]): Promise<Context> {
|
|
const ctx = new Context()
|
|
const fiber = ctx.plugin(CredentialsLocal, config)
|
|
cleanups.push(async () => { await fiber.dispose() })
|
|
await fiber
|
|
return ctx
|
|
}
|
|
|
|
describe('read-modify-write', () => {
|
|
it('folds an unobserved external edit into a write instead of overwriting it', async () => {
|
|
const dir = await tempDir()
|
|
const path = join(dir, '.credentials.yaml')
|
|
const ctx = await boot({ path, watch: false })
|
|
const seen: string[] = []
|
|
ctx.on('credentials/updated', (ref) => { seen.push(ref) })
|
|
await ctx.credentials.set(ALPHA, 'one')
|
|
// The external edit has landed on disk but no watcher reported it (watch
|
|
// is off — the same blind spot as a debounce window or a missed event).
|
|
await writeFile(path, `${ALPHA}: one\n${BETA}: external\n`)
|
|
await ctx.credentials.set(ALPHA, 'two')
|
|
const text = await readFile(path, 'utf8')
|
|
expect(text).toContain(`${BETA}: external`)
|
|
expect(text).toContain(`${ALPHA}: two`)
|
|
// The fold published the unobserved entry before the write's own commit.
|
|
expect(seen).toEqual([ALPHA, BETA, ALPHA])
|
|
expect(await ctx.credentials.resolve(BETA)).toEqual({ value: 'external', source: 'file' })
|
|
})
|
|
|
|
it('keeps both refs when two providers write the same document concurrently', async () => {
|
|
const dir = await tempDir()
|
|
const path = join(dir, '.credentials.yaml')
|
|
const first = await boot({ path, watch: false })
|
|
const second = await boot({ path, watch: false })
|
|
await Promise.all([
|
|
(async () => { for (const value of ['1', '2', '3'] as const) await first.credentials.set(ALPHA, value) })(),
|
|
(async () => { for (const value of ['1', '2', '3'] as const) await second.credentials.set(BETA, value) })(),
|
|
])
|
|
const third = await boot({ path, watch: false })
|
|
expect(await third.credentials.resolve(ALPHA)).toEqual({ value: '3', source: 'file' })
|
|
expect(await third.credentials.resolve(BETA)).toEqual({ value: '3', source: 'file' })
|
|
})
|
|
|
|
it('creates the credentials directory owner-only', async () => {
|
|
const dir = await tempDir()
|
|
const home = join(dir, 'home')
|
|
const ctx = await boot({ path: join(home, '.credentials.yaml'), watch: false })
|
|
await ctx.credentials.set(ALPHA, 'one')
|
|
expect((await stat(home)).mode & 0o777).toBe(0o700)
|
|
})
|
|
})
|
|
|
|
describe('contained update fan-out', () => {
|
|
it('does not fail a committed set when a listener throws, and later listeners still run', async () => {
|
|
const dir = await tempDir()
|
|
const ctx = await boot({ path: join(dir, '.credentials.yaml'), watch: false })
|
|
ctx.on('credentials/updated', () => {
|
|
throw new Error('observer boom')
|
|
})
|
|
const second = vi.fn()
|
|
ctx.on('credentials/updated', second)
|
|
await expect(ctx.credentials.set(ALPHA, 'one')).resolves.toBeUndefined()
|
|
expect(second).toHaveBeenCalledWith(ALPHA)
|
|
expect(await ctx.credentials.resolve(ALPHA)).toEqual({ value: 'one', source: 'file' })
|
|
})
|
|
|
|
it('contains an async listener rejection', async () => {
|
|
const dir = await tempDir()
|
|
const ctx = await boot({ path: join(dir, '.credentials.yaml'), watch: false })
|
|
// An unknown-returning function keeps the typed surface legal while the
|
|
// runtime value is still the rejected promise the containment must handle.
|
|
const boom = (): unknown => Promise.reject(new Error('async observer boom'))
|
|
ctx.on('credentials/updated', boom)
|
|
await expect(ctx.credentials.set(ALPHA, 'one')).resolves.toBeUndefined()
|
|
await new Promise(resolve => setTimeout(resolve, 10))
|
|
})
|
|
|
|
it('rethrows an invariant-coded failure after the commit and the remaining listeners', async () => {
|
|
const dir = await tempDir()
|
|
const path = join(dir, '.credentials.yaml')
|
|
const ctx = await boot({ path, watch: false })
|
|
ctx.on('credentials/updated', () => {
|
|
throw Object.assign(new Error('forged relation'), { code: 'INVARIANT' })
|
|
})
|
|
const second = vi.fn()
|
|
ctx.on('credentials/updated', second)
|
|
await expect(ctx.credentials.set(ALPHA, 'one')).rejects.toThrow(/forged relation/)
|
|
// Harness-fatal by design — but the write itself committed first.
|
|
expect(second).toHaveBeenCalledWith(ALPHA)
|
|
expect(await readFile(path, 'utf8')).toContain(`${ALPHA}: one`)
|
|
expect(await ctx.credentials.resolve(ALPHA)).toEqual({ value: 'one', source: 'file' })
|
|
})
|
|
})
|
|
|
|
describe('document editor', () => {
|
|
it('leaves a sibling multi-line value untouched while patching one entry', async () => {
|
|
const dir = await tempDir()
|
|
const path = join(dir, '.credentials.yaml')
|
|
const wrapped = `DSH_REVIEW_WRAPPED: |-\n line1\n line2\n${ALPHA}: a\n`
|
|
await writeFile(path, wrapped)
|
|
const ctx = await boot({ path, watch: false })
|
|
await ctx.credentials.set(ALPHA, 'b')
|
|
expect(await readFile(path, 'utf8')).toBe(`DSH_REVIEW_WRAPPED: |-\n line1\n line2\n${ALPHA}: b\n`)
|
|
expect(await ctx.credentials.resolve(credentialRef('DSH_REVIEW_WRAPPED')))
|
|
.toEqual({ value: 'line1\nline2', source: 'file' })
|
|
})
|
|
|
|
it('stores a value that looks like another entry without creating one', async () => {
|
|
const dir = await tempDir()
|
|
const path = join(dir, '.credentials.yaml')
|
|
const ctx = await boot({ path, watch: false })
|
|
// The stored text must stay a value: a quoted-scalar write that leaked its
|
|
// own structure would silently mint a credential nobody stored.
|
|
await ctx.credentials.set(ALPHA, `${INNER}: injected`)
|
|
const reread = await boot({ path, watch: false })
|
|
expect(await reread.credentials.resolve(ALPHA)).toEqual({ value: `${INNER}: injected`, source: 'file' })
|
|
expect(await reread.credentials.resolve(INNER)).toBeUndefined()
|
|
})
|
|
})
|