wushenghua/hapi
1
0
Fork 0
mirror of https://github.com/wu736139669/hapi.git synced 2026-08-05 06:24:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(codex): support slash controls and skill discovery (#545)

Browse Source 
* feat(codex): resolve slash controls before sending to Codex

* feat(codex): discover commands and skills

* fix(codex): handle slash commands before attachments

* fix(codex): block remaining unsupported built-ins
This commit is contained in:
CoColate
2026-04-29 09:20:11 +08:00
committed by GitHub
parent 9c117679f0
commit 9d2dec137b
12 changed files with 571 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/src/codex/runCodex.ts
+84 -15
View File
@@ -1,4 +1,5 @@
import { logger } from '@/ui/logger';
import { randomUUID } from 'node:crypto';
import { loop, type EnhancedMode, type PermissionMode } from './loop';
import { MessageQueue2 } from '@/utils/MessageQueue2';
import { hashObject } from '@/utils/deterministicJson';
@@ -13,6 +14,8 @@ import { CodexCollaborationModeSchema, PermissionModeSchema } from '@hapi/protoc
import { formatMessageWithAttachments } from '@/utils/attachmentFormatter';
import { getInvokedCwd } from '@/utils/invokedCwd';
import type { ReasoningEffort } from './appServerTypes';
import { listSlashCommands } from '@/modules/common/slashCommands';
import { resolveCodexSlashCommand } from './utils/slashCommands';
export { emitReadyIfIdle } from './utils/emitReadyIfIdle';
@@ -89,7 +92,29 @@ export async function runCodex(opts: {
);
};
session.onUserMessage((message, localId) => {
const applySlashUpdates = (updates: {
permissionMode?: PermissionMode;
model?: string | null;
modelReasoningEffort?: ReasoningEffort | null;
collaborationMode?: EnhancedMode['collaborationMode'];
} | undefined): void => {
if (!updates) return;
if (updates.permissionMode !== undefined) {
currentPermissionMode = updates.permissionMode;
}
if (updates.model !== undefined) {
currentModel = updates.model ?? undefined;
}
if (updates.modelReasoningEffort !== undefined) {
currentModelReasoningEffort = updates.modelReasoningEffort ?? undefined;
}
if (updates.collaborationMode !== undefined) {
currentCollaborationMode = updates.collaborationMode;
}
applyCurrentConfigToSession();
};
const syncCurrentConfigFromSession = (): void => {
const sessionPermissionMode = sessionWrapperRef.current?.getPermissionMode();
if (sessionPermissionMode && isPermissionModeAllowedForFlavor(sessionPermissionMode, 'codex')) {
currentPermissionMode = sessionPermissionMode as PermissionMode;
@@ -106,22 +131,66 @@ export async function runCodex(opts: {
if (sessionCollaborationMode) {
currentCollaborationMode = sessionCollaborationMode;
}
};
const messagePermissionMode = currentPermissionMode;
logger.debug(
`[Codex] User message received with permission mode: ${currentPermissionMode}, ` +
`model: ${currentModel ?? 'auto'}, modelReasoningEffort: ${currentModelReasoningEffort ?? 'default'}, ` +
`collaborationMode: ${currentCollaborationMode}`
);
let userMessageChain: Promise<void> = Promise.resolve();
session.onUserMessage((message, localId) => {
userMessageChain = userMessageChain.then(async () => {
try {
syncCurrentConfigFromSession();
let text = message.content.text;
const commands = await listSlashCommands('codex', workingDirectory).catch(() => []);
const slash = resolveCodexSlashCommand(text, {
commands,
permissionMode: currentPermissionMode,
collaborationMode: currentCollaborationMode,
model: currentModel,
modelReasoningEffort: currentModelReasoningEffort
});
if (slash.kind !== 'passthrough') {
applySlashUpdates(slash.updates);
if (slash.message) {
session.sendAgentMessage({
type: 'message',
message: slash.message,
id: randomUUID()
});
}
if (slash.kind === 'handled') {
if (localId) session.emitMessagesConsumed([localId]);
return;
}
text = slash.text;
}
text = formatMessageWithAttachments(text, message.content.attachments);
const enhancedMode: EnhancedMode = {
permissionMode: messagePermissionMode ?? 'default',
model: currentModel,
modelReasoningEffort: currentModelReasoningEffort,
collaborationMode: currentCollaborationMode
};
const formattedText = formatMessageWithAttachments(message.content.text, message.content.attachments);
messageQueue.push(formattedText, enhancedMode, localId);
const messagePermissionMode = currentPermissionMode;
logger.debug(
`[Codex] User message received with permission mode: ${currentPermissionMode}, ` +
`model: ${currentModel ?? 'auto'}, modelReasoningEffort: ${currentModelReasoningEffort ?? 'default'}, ` +
`collaborationMode: ${currentCollaborationMode}`
);
const enhancedMode: EnhancedMode = {
permissionMode: messagePermissionMode ?? 'default',
model: currentModel,
modelReasoningEffort: currentModelReasoningEffort,
collaborationMode: currentCollaborationMode
};
messageQueue.push(text, enhancedMode, localId);
} catch (error) {
logger.debug('[Codex] Failed to handle user message', error);
const enhancedMode: EnhancedMode = {
permissionMode: currentPermissionMode ?? 'default',
model: currentModel,
modelReasoningEffort: currentModelReasoningEffort,
collaborationMode: currentCollaborationMode
};
messageQueue.push(formatMessageWithAttachments(message.content.text, message.content.attachments), enhancedMode, localId);
}
}).catch((error) => {
logger.debug('[Codex] User message handler chain failed', error);
});
});
const formatFailureReason = (message: string): string => {