agent-bot/takt
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
nrslib 2026-02-19 19:52:11 +09:00
parent 6371b8f3b1
commit 391e56b51a
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/__tests__/retryMode.test.ts
View File

@ -132,20 +132,20 @@ describe('buildRetryTemplateVars', () => {
expect(vars.movementDetails).toContain('Architect'); expect(vars.movementDetails).toContain('Architect');
}); });
it('should set hasPreviousOrder=false and empty previousOrderContent when previousOrderContent is null', () => { it('should set hasOrderContent=false and empty orderContent when previousOrderContent is null (via ctx)', () => {
const ctx = createRetryContext({ previousOrderContent: null }); const ctx = createRetryContext({ previousOrderContent: null });
const vars = buildRetryTemplateVars(ctx, 'en'); const vars = buildRetryTemplateVars(ctx, 'en');
expect(vars.hasPreviousOrder).toBe(false); expect(vars.hasOrderContent).toBe(false);
expect(vars.previousOrderContent).toBe(''); expect(vars.orderContent).toBe('');
}); });
it('should set hasPreviousOrder=true and populate previousOrderContent when provided', () => { it('should set hasOrderContent=true and populate orderContent when provided via parameter', () => {
const ctx = createRetryContext({ previousOrderContent: '# Order content' }); const ctx = createRetryContext();
const vars = buildRetryTemplateVars(ctx, 'en'); const vars = buildRetryTemplateVars(ctx, 'en', '# Order content');
expect(vars.hasPreviousOrder).toBe(true); expect(vars.hasOrderContent).toBe(true);
expect(vars.previousOrderContent).toBe('# Order content'); expect(vars.orderContent).toBe('# Order content');
}); });
it('should include retryNote when present', () => { it('should include retryNote when present', () => {

10
src/__tests__/retrySlashCommand.test.ts
View File

@ -8,7 +8,7 @@
*/ */
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
import { mkdirSync, writeFileSync, rmSync } from 'node:fs'; import { mkdirSync, rmSync } from 'node:fs';
import { join } from 'node:path'; import { join } from 'node:path';
import { tmpdir } from 'node:os'; import { tmpdir } from 'node:os';
import { import {
@ -153,7 +153,7 @@ describe('/retry slash command', () => {
setupProvider([]); setupProvider([]);
const retryContext = buildRetryContext({ previousOrderContent: orderContent }); const retryContext = buildRetryContext({ previousOrderContent: orderContent });
const result = await runRetryMode(tmpDir, retryContext); const result = await runRetryMode(tmpDir, retryContext, orderContent);
expect(result.action).toBe('execute'); expect(result.action).toBe('execute');
expect(result.task).toBe(orderContent); expect(result.task).toBe(orderContent);
@ -164,7 +164,7 @@ describe('/retry slash command', () => {
setupProvider([]); setupProvider([]);
const retryContext = buildRetryContext({ previousOrderContent: null }); const retryContext = buildRetryContext({ previousOrderContent: null });
const result = await runRetryMode(tmpDir, retryContext); const result = await runRetryMode(tmpDir, retryContext, null);
expect(mockInfo).toHaveBeenCalledWith('No previous order found.'); expect(mockInfo).toHaveBeenCalledWith('No previous order found.');
expect(result.action).toBe('cancel'); expect(result.action).toBe('cancel');
@ -176,7 +176,7 @@ describe('/retry slash command', () => {
const capture = setupProvider(['I see the order content.']); const capture = setupProvider(['I see the order content.']);
const retryContext = buildRetryContext({ previousOrderContent: orderContent }); const retryContext = buildRetryContext({ previousOrderContent: orderContent });
await runRetryMode(tmpDir, retryContext); await runRetryMode(tmpDir, retryContext, orderContent);
expect(capture.systemPrompts.length).toBeGreaterThan(0); expect(capture.systemPrompts.length).toBeGreaterThan(0);
const systemPrompt = capture.systemPrompts[0]!; const systemPrompt = capture.systemPrompts[0]!;
@ -189,7 +189,7 @@ describe('/retry slash command', () => {
const capture = setupProvider(['No order found.']); const capture = setupProvider(['No order found.']);
const retryContext = buildRetryContext({ previousOrderContent: null }); const retryContext = buildRetryContext({ previousOrderContent: null });
await runRetryMode(tmpDir, retryContext); await runRetryMode(tmpDir, retryContext, null);
expect(capture.systemPrompts.length).toBeGreaterThan(0); expect(capture.systemPrompts.length).toBeGreaterThan(0);
const systemPrompt = capture.systemPrompts[0]!; const systemPrompt = capture.systemPrompts[0]!;