diff --git a/.gitignore b/.gitignore index efeb989d3..b2c1de9a2 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,6 @@ apps/ios/*.mobileprovision IDENTITY.md USER.md .tgz + +# local tooling +.serena/ diff --git a/.serena/.gitignore b/.serena/.gitignore deleted file mode 100644 index 14d86ad62..000000000 --- a/.serena/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/cache diff --git a/.serena/cache/typescript/document_symbols.pkl b/.serena/cache/typescript/document_symbols.pkl deleted file mode 100644 index 328546c76..000000000 Binary files a/.serena/cache/typescript/document_symbols.pkl and /dev/null differ diff --git a/.serena/cache/typescript/raw_document_symbols.pkl b/.serena/cache/typescript/raw_document_symbols.pkl deleted file mode 100644 index afe55aa0a..000000000 Binary files a/.serena/cache/typescript/raw_document_symbols.pkl and /dev/null differ diff --git a/.serena/project.yml b/.serena/project.yml deleted file mode 100644 index 0b7f659b9..000000000 --- a/.serena/project.yml +++ /dev/null @@ -1,87 +0,0 @@ -# list of languages for which language servers are started; choose from: -# al bash clojure cpp csharp csharp_omnisharp -# dart elixir elm erlang fortran fsharp -# go groovy haskell java julia kotlin -# lua markdown nix pascal perl php -# powershell python python_jedi r rego ruby -# ruby_solargraph rust scala swift terraform toml -# typescript typescript_vts yaml zig -# Note: -# - For C, use cpp -# - For JavaScript, use typescript -# - For Free Pascal / Lazarus, use pascal -# Special requirements: -# - csharp: Requires the presence of a .sln file in the project folder. -# - pascal: Requires Free Pascal Compiler (fpc) and optionally Lazarus. -# When using multiple languages, the first language server that supports a given file will be used for that file. -# The first language is the default language and the respective language server will be used as a fallback. -# Note that when using the JetBrains backend, language servers are not used and this list is correspondingly ignored. -languages: -- typescript - -# the encoding used by text files in the project -# For a list of possible encodings, see https://docs.python.org/3.11/library/codecs.html#standard-encodings -encoding: "utf-8" - -# whether to use the project's gitignore file to ignore files -# Added on 2025-04-07 -ignore_all_files_in_gitignore: true - -# list of additional paths to ignore -# same syntax as gitignore, so you can use * and ** -# Was previously called `ignored_dirs`, please update your config if you are using that. -# Added (renamed) on 2025-04-07 -ignored_paths: [] - -# whether the project is in read-only mode -# If set to true, all editing tools will be disabled and attempts to use them will result in an error -# Added on 2025-04-18 -read_only: false - -# list of tool names to exclude. We recommend not excluding any tools, see the readme for more details. -# Below is the complete list of tools for convenience. -# To make sure you have the latest list of tools, and to view their descriptions, -# execute `uv run scripts/print_tool_overview.py`. -# -# * `activate_project`: Activates a project by name. -# * `check_onboarding_performed`: Checks whether project onboarding was already performed. -# * `create_text_file`: Creates/overwrites a file in the project directory. -# * `delete_lines`: Deletes a range of lines within a file. -# * `delete_memory`: Deletes a memory from Serena's project-specific memory store. -# * `execute_shell_command`: Executes a shell command. -# * `find_referencing_code_snippets`: Finds code snippets in which the symbol at the given location is referenced. -# * `find_referencing_symbols`: Finds symbols that reference the symbol at the given location (optionally filtered by type). -# * `find_symbol`: Performs a global (or local) search for symbols with/containing a given name/substring (optionally filtered by type). -# * `get_current_config`: Prints the current configuration of the agent, including the active and available projects, tools, contexts, and modes. -# * `get_symbols_overview`: Gets an overview of the top-level symbols defined in a given file. -# * `initial_instructions`: Gets the initial instructions for the current project. -# Should only be used in settings where the system prompt cannot be set, -# e.g. in clients you have no control over, like Claude Desktop. -# * `insert_after_symbol`: Inserts content after the end of the definition of a given symbol. -# * `insert_at_line`: Inserts content at a given line in a file. -# * `insert_before_symbol`: Inserts content before the beginning of the definition of a given symbol. -# * `list_dir`: Lists files and directories in the given directory (optionally with recursion). -# * `list_memories`: Lists memories in Serena's project-specific memory store. -# * `onboarding`: Performs onboarding (identifying the project structure and essential tasks, e.g. for testing or building). -# * `prepare_for_new_conversation`: Provides instructions for preparing for a new conversation (in order to continue with the necessary context). -# * `read_file`: Reads a file within the project directory. -# * `read_memory`: Reads the memory with the given name from Serena's project-specific memory store. -# * `remove_project`: Removes a project from the Serena configuration. -# * `replace_lines`: Replaces a range of lines within a file with new content. -# * `replace_symbol_body`: Replaces the full definition of a symbol. -# * `restart_language_server`: Restarts the language server, may be necessary when edits not through Serena happen. -# * `search_for_pattern`: Performs a search for a pattern in the project. -# * `summarize_changes`: Provides instructions for summarizing the changes made to the codebase. -# * `switch_modes`: Activates modes by providing a list of their names -# * `think_about_collected_information`: Thinking tool for pondering the completeness of collected information. -# * `think_about_task_adherence`: Thinking tool for determining whether the agent is still on track with the current task. -# * `think_about_whether_you_are_done`: Thinking tool for determining whether the task is truly completed. -# * `write_memory`: Writes a named memory (for future reference) to Serena's project-specific memory store. -excluded_tools: [] - -# initial prompt for the project. It will always be given to the LLM upon activating the project -# (contrary to the memories, which are loaded on demand). -initial_prompt: "" - -project_name: "clawdbot" -included_optional_tools: [] diff --git a/src/auto-reply/reply/session.test.ts b/src/auto-reply/reply/session.test.ts index bdc2adbd0..dca2ae1c8 100644 --- a/src/auto-reply/reply/session.test.ts +++ b/src/auto-reply/reply/session.test.ts @@ -151,6 +151,34 @@ describe("initSessionState RawBody", () => { expect(result.bodyStripped).toBe(""); }); + it("preserves argument casing while still matching reset triggers case-insensitively", async () => { + const root = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-rawbody-reset-case-")); + const storePath = path.join(root, "sessions.json"); + + const cfg = { + session: { + store: storePath, + resetTriggers: ["/new"], + }, + } as ClawdbotConfig; + + const ctx = { + RawBody: "/NEW KeepThisCase", + ChatType: "direct", + SessionKey: "agent:main:whatsapp:dm:S1", + }; + + const result = await initSessionState({ + ctx, + cfg, + commandAuthorized: true, + }); + + expect(result.isNewSession).toBe(true); + expect(result.bodyStripped).toBe("KeepThisCase"); + expect(result.triggerBodyNormalized).toBe("/NEW KeepThisCase"); + }); + it("falls back to Body when RawBody is undefined", async () => { const root = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-rawbody-fallback-")); const storePath = path.join(root, "sessions.json"); diff --git a/src/auto-reply/reply/session.ts b/src/auto-reply/reply/session.ts index 960ee92b6..9b4efd226 100644 --- a/src/auto-reply/reply/session.ts +++ b/src/auto-reply/reply/session.ts @@ -136,7 +136,10 @@ export async function initSessionState(params: { // Prefer CommandBody/RawBody (clean message) for command detection; fall back // to Body which may contain structural context (history, sender labels). const commandSource = ctx.BodyForCommands ?? ctx.CommandBody ?? ctx.RawBody ?? ctx.Body ?? ""; - const triggerBodyNormalized = stripStructuralPrefixes(commandSource).trim().toLowerCase(); + // IMPORTANT: do NOT lowercase the entire command body. + // Users often pass case-sensitive arguments (e.g. filesystem paths on Linux). + // Command parsing downstream lowercases only the command token for matching. + const triggerBodyNormalized = stripStructuralPrefixes(commandSource).trim(); // Use CommandBody/RawBody for reset trigger matching (clean message without structural context). const rawBody = commandSource; @@ -152,17 +155,27 @@ export async function initSessionState(params: { const strippedForReset = isGroup ? stripMentions(triggerBodyNormalized, ctx, cfg, agentId) : triggerBodyNormalized; + + // Reset triggers are configured as lowercased commands (e.g. "/new"), but users may type + // "/NEW" etc. Match case-insensitively while keeping the original casing for any stripped body. + const trimmedBodyLower = trimmedBody.toLowerCase(); + const strippedForResetLower = strippedForReset.toLowerCase(); + for (const trigger of resetTriggers) { if (!trigger) continue; if (!resetAuthorized) break; - if (trimmedBody === trigger || strippedForReset === trigger) { + const triggerLower = trigger.toLowerCase(); + if (trimmedBodyLower === triggerLower || strippedForResetLower === triggerLower) { isNewSession = true; bodyStripped = ""; resetTriggered = true; break; } - const triggerPrefix = `${trigger} `; - if (trimmedBody.startsWith(triggerPrefix) || strippedForReset.startsWith(triggerPrefix)) { + const triggerPrefixLower = `${triggerLower} `; + if ( + trimmedBodyLower.startsWith(triggerPrefixLower) || + strippedForResetLower.startsWith(triggerPrefixLower) + ) { isNewSession = true; bodyStripped = strippedForReset.slice(trigger.length).trimStart(); resetTriggered = true;