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
5 changes: 1 addition & 4 deletions bin/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ ${issueText}
createIssueComment,
},
maxSteps: 30,
useStreaming: streamMode,
useStreaming: streamMode, // 付録A(ストリーミング機能)用フラグ
// Yoloモードなら自動承認
approvalFunc: yoloMode ? async (name) => {
console.log(`[自動承認] ツール ${name} の実行を承認しました`);
Expand All @@ -173,9 +173,6 @@ ${issueText}
if (isCI) {
console.log('\n' + '─'.repeat(60));
console.log(`[完了] 正常終了`);
if (result.usage) {
console.log(`[使用トークン] ${result.usage.totalTokens} tokens`);
}
}
} catch (error) {
console.error('\n' + '─'.repeat(60));
Expand Down
113 changes: 106 additions & 7 deletions bin/review.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import * as fsPromises from 'fs/promises';
import { join, resolve, sep } from 'path';
import { config } from '../src/config';
import { spawn } from 'child_process';
import type { Tool } from '../src/types';
import type { Tool, LanguageModel, Message } from '../src/types';

// 機密情報をマスクする(ログ出力用)
function maskSecret(value: string | undefined): string {
Expand Down Expand Up @@ -403,9 +403,29 @@ async function main() {

const model = createModelFromEnv({ useResponses: false });

// 履歴圧縮(manageContext)による API 400 不整合エラーを防ぐための安全なラッパー
const secureModel: LanguageModel = {
async doGenerate(params) {
const cleanedParams = {
...params,
messages: cleanMessages(params.messages),
};
return model.doGenerate(cleanedParams);
},
...(model.doStream && {
async *doStream(params) {
const cleanedParams = {
...params,
messages: cleanMessages(params.messages),
};
yield* model.doStream!(cleanedParams);
}
})
};

const agent = new Agent({
name: 'nano-code-reviewer',
model,
model: secureModel,
instructions: prReviewInstructions,
tools: {
readFile: reviewReadFile, // PRレビュー用の制限緩和版
Expand All @@ -422,14 +442,11 @@ async function main() {
});

try {
const result = await agent.generate(`プルリクエスト #${prNumber} のコードレビューを行い、コメントを投稿してください。`);
await agent.generate(`プルリクエスト #${prNumber} のコードレビューを行い、コメントを投稿してください。`);

if (isCI) {
console.log('\n' + '─'.repeat(60));
console.log(`[完了] レビューが正常に終了しました`);
if (result.usage) {
console.log(`[使用トークン] ${result.usage.totalTokens} tokens`);
}
}
} catch (error) {
console.error('\n' + '─'.repeat(60));
Expand All @@ -446,4 +463,86 @@ async function main() {
}
}

main();
export function cleanMessages(messages: Message[]): Message[] {
const existingToolCallIds = new Set(
messages
.filter((m) => m.role === 'tool')
.map((m) => (m as any).toolCallId)
);

const finalMessages: Message[] = [];
for (const msg of messages) {
if (msg.role === 'tool') {
let foundAssistant = false;
for (let j = finalMessages.length - 1; j >= 0; j--) {
const prev = finalMessages[j];
if (
prev &&
prev.role === 'assistant' &&
'toolCalls' in prev &&
prev.toolCalls
) {
if (
prev.toolCalls.some(
(tc: any) => tc.toolCallId === msg.toolCallId
)
) {
foundAssistant = true;
break;
}
}
}
if (!foundAssistant) {
// 親の assistant が manageContext によって削減されて消えている場合、
// 親子関係の整合性を保つため、ダミーの assistant (toolCalls) メッセージを自動挿入して補完する
finalMessages.push({
role: 'assistant',
content: 'ツールを実行します。',
toolCalls: [{
toolCallId: msg.toolCallId,
name: msg.name,
args: {}
}]
} as Message);
}
finalMessages.push(msg);
} else if (
msg.role === 'assistant' &&
'toolCalls' in msg &&
msg.toolCalls
) {
const validToolCalls = msg.toolCalls.filter((tc: any) =>
existingToolCallIds.has(tc.toolCallId)
);
if (validToolCalls.length > 0) {
finalMessages.push({
role: 'assistant',
content: msg.content,
toolCalls: validToolCalls,
} as Message);
} else {
finalMessages.push({
role: 'assistant',
content: msg.content,
} as Message);
}
} else {
finalMessages.push(msg);
}
}

// 最終安全弁: system メッセージを除いた結果が空になるのを防ぐ
const nonSystemMessages = finalMessages.filter(m => m.role !== 'system');
if (nonSystemMessages.length === 0) {
finalMessages.push({
role: 'user',
content: '続けてください。'
});
}

return finalMessages;
}

if (import.meta.main) {
main();
}
39 changes: 0 additions & 39 deletions chapters/05-agent-demo.ts

This file was deleted.

32 changes: 32 additions & 0 deletions chapters/05-coding-agent.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { Agent } from '../src/core/agent';
import { createOpenAI } from '../src/providers/openai';
import { readFile } from '../src/tools/readFile';
import { writeFile } from '../src/tools/writeFile';
import { editFile } from '../src/tools/editFile';
import { execCommand } from '../src/tools/execCommand';

// モデルインスタンスを作成
const openai = createOpenAI();
const model = openai('gpt-5');

export const codingAgent = new Agent({
name: 'nano-code',
instructions: 'あなたはコーディングエージェントです。慎重に作業してください。',
model,
tools: {
readFile,
writeFile,
editFile,
execCommand,
},
maxSteps: 20,
verbose: true,
});

// 実行(直接実行された場合のみ)
if (import.meta.main) {
const result = await codingAgent.generate(
'tests/example.test.ts のバグを修正して'
);
console.log(result.text);
}
Loading
Loading