npm - flowent - Versions diffs - 0.0.12 → 0.0.13 - Mend

flowent 0.0.12 → 0.0.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (43) hide show

package/backend/src/flowent/static/index.html CHANGED Viewed

@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Flowent</title>
     <meta name="description" content="Flowent application" />
-    <script type="module" crossorigin src="/assets/index-DXQ_smj0.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-BwQOML_0.css">
+    <script type="module" crossorigin src="/assets/index-S5a0Rkj1.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-CEZrWoDG.css">
   </head>
   <body>
     <div id="root"></div>

package/backend/src/flowent/storage.py CHANGED Viewed

@@ -8,6 +8,28 @@ from flowent.llm import ProviderFormat, ReasoningEffort
 from flowent.paths import data_directory
+class StoredTelegramSession(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+    chat_id: str
+    display_name: str = ""
+    recent_message: str = ""
+    status: str
+    updated_at: int = 0
+    user_id: str = ""
+    username: str = ""
+class StoredTelegramBot(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+    bot_token: str
+    enabled: bool
+    error: str = ""
+    sessions: list[StoredTelegramSession] = Field(default_factory=list)
+    status: str = "disabled"
 class StoredProvider(BaseModel):
     model_config = ConfigDict(extra="forbid")
@@ -55,6 +77,7 @@ class StoredState(BaseModel):
     messages: list[StoredMessage]
     providers: list[StoredProvider]
     settings: StoredSettings
+    telegram_bot: StoredTelegramBot
 class StateStore:
@@ -74,6 +97,7 @@ class StateStore:
     def read_state(self) -> StoredState:
         with self.connect() as connection:
+            telegram_bot = self._read_telegram_bot(connection)
             providers = [
                 StoredProvider(
                     api_key=row["api_key"],
@@ -130,6 +154,105 @@ class StateStore:
                 if settings_row
                 else "",
             ),
+            telegram_bot=telegram_bot,
+        )
+    def read_telegram_bot(self) -> StoredTelegramBot:
+        with self.connect() as connection:
+            return self._read_telegram_bot(connection)
+    def save_telegram_bot(self, telegram_bot: StoredTelegramBot) -> StoredTelegramBot:
+        with self.connect() as connection:
+            connection.execute(
+                """
+                INSERT INTO telegram_bot (
+                    id,
+                    enabled,
+                    bot_token
+                )
+                VALUES (1, ?, ?)
+                ON CONFLICT(id) DO UPDATE SET
+                    enabled = excluded.enabled,
+                    bot_token = excluded.bot_token,
+                    updated_at = unixepoch()
+                """,
+                (
+                    int(telegram_bot.enabled),
+                    telegram_bot.bot_token,
+                ),
+            )
+            return self._read_telegram_bot(connection)
+    def save_telegram_session(
+        self, session: StoredTelegramSession
+    ) -> StoredTelegramSession:
+        with self.connect() as connection:
+            connection.execute(
+                """
+                INSERT INTO telegram_sessions (
+                    chat_id,
+                    user_id,
+                    username,
+                    display_name,
+                    recent_message,
+                    status
+                )
+                VALUES (?, ?, ?, ?, ?, ?)
+                ON CONFLICT(chat_id) DO UPDATE SET
+                    user_id = excluded.user_id,
+                    username = excluded.username,
+                    display_name = excluded.display_name,
+                    recent_message = excluded.recent_message,
+                    status = excluded.status,
+                    updated_at = unixepoch()
+                """,
+                (
+                    session.chat_id,
+                    session.user_id,
+                    session.username,
+                    session.display_name,
+                    session.recent_message,
+                    session.status,
+                ),
+            )
+        return session
+    def approve_telegram_session(self, chat_id: str) -> StoredTelegramSession:
+        with self.connect() as connection:
+            connection.execute(
+                """
+                UPDATE telegram_sessions
+                SET status = 'approved',
+                    updated_at = unixepoch()
+                WHERE chat_id = ?
+                """,
+                (chat_id,),
+            )
+            row = connection.execute(
+                """
+                SELECT
+                    chat_id,
+                    user_id,
+                    username,
+                    display_name,
+                    recent_message,
+                    status,
+                    updated_at
+                FROM telegram_sessions
+                WHERE chat_id = ?
+                """,
+                (chat_id,),
+            ).fetchone()
+        if row is None:
+            raise KeyError(chat_id)
+        return StoredTelegramSession(
+            chat_id=row["chat_id"],
+            display_name=row["display_name"],
+            recent_message=row["recent_message"],
+            status=row["status"],
+            updated_at=row["updated_at"],
+            user_id=row["user_id"],
+            username=row["username"],
         )
     def save_provider(self, provider: StoredProvider) -> StoredProvider:
@@ -263,9 +386,65 @@ class StateStore:
             )
         ]
+    def _read_telegram_bot(self, connection: sqlite3.Connection) -> StoredTelegramBot:
+        bot_row = connection.execute(
+            """
+            SELECT enabled, bot_token
+            FROM telegram_bot
+            WHERE id = 1
+            """
+        ).fetchone()
+        sessions = [
+            StoredTelegramSession(
+                chat_id=row["chat_id"],
+                display_name=row["display_name"],
+                recent_message=row["recent_message"],
+                status=row["status"],
+                updated_at=row["updated_at"],
+                user_id=row["user_id"],
+                username=row["username"],
+            )
+            for row in connection.execute(
+                """
+                SELECT
+                    chat_id,
+                    user_id,
+                    username,
+                    display_name,
+                    recent_message,
+                    status,
+                    updated_at
+                FROM telegram_sessions
+                ORDER BY status DESC, updated_at DESC, chat_id
+                """
+            )
+        ]
+        return StoredTelegramBot(
+            bot_token=bot_row["bot_token"] if bot_row else "",
+            enabled=bool(bot_row["enabled"]) if bot_row else False,
+            sessions=sessions,
+        )
     def _migrate(self, connection: sqlite3.Connection) -> None:
         connection.executescript(
             """
+            CREATE TABLE IF NOT EXISTS telegram_bot (
+                id INTEGER PRIMARY KEY CHECK (id = 1),
+                enabled INTEGER NOT NULL DEFAULT 0,
+                bot_token TEXT NOT NULL,
+                updated_at INTEGER NOT NULL DEFAULT (unixepoch())
+            );
+            CREATE TABLE IF NOT EXISTS telegram_sessions (
+                chat_id TEXT PRIMARY KEY,
+                user_id TEXT NOT NULL DEFAULT '',
+                username TEXT NOT NULL DEFAULT '',
+                display_name TEXT NOT NULL DEFAULT '',
+                recent_message TEXT NOT NULL DEFAULT '',
+                status TEXT NOT NULL,
+                updated_at INTEGER NOT NULL DEFAULT (unixepoch())
+            );
             CREATE TABLE IF NOT EXISTS providers (
                 id TEXT PRIMARY KEY,
                 name TEXT NOT NULL,

package/backend/src/flowent/tools.py CHANGED Viewed

@@ -162,7 +162,7 @@ def tool_call_title(name: str, arguments: dict[str, object]) -> str:
     if name == "grep_files":
         return f"Searching {arguments.get('pattern', 'files')}"
     if name == "apply_patch":
-        return "Applying patch"
+        return "Editing files"
     if name == "shell_command":
         return f"Running {arguments.get('command', 'command')}"
     if name == "update_plan":
@@ -192,9 +192,10 @@ def run_tool(
             return web_search(arguments, context)
         raise ValueError("Tool is not available.")
     except Exception as error:
-        return ToolResult(
-            content=str(error), ok=False, title=tool_call_title(name, arguments)
+        title = (
+            "Edit failed" if name == "apply_patch" else tool_call_title(name, arguments)
         )
+        return ToolResult(content=str(error), ok=False, title=title)
 def integer_argument(arguments: dict[str, object], name: str, default: int) -> int:
@@ -262,13 +263,35 @@ def apply_patch_tool(arguments: dict[str, object], context: ToolContext) -> Tool
     )
     if result.exit_code != 0:
         raise SandboxError(tool_failure_content(result))
+    data = json.loads(result.stdout or "{}")
     return ToolResult(
         content=result.stdout,
-        data={"files": [str(path) for path in paths]},
-        title="Applied patch",
+        data=data if isinstance(data, dict) else {},
+        title=patch_title_from_result(data),
     )
+def patch_title_from_result(data: object) -> str:
+    if not isinstance(data, dict):
+        return "Edited files"
+    files = data.get("files")
+    if not isinstance(files, list) or not files:
+        return "Edited files"
+    if len(files) > 1:
+        return f"Edited {len(files)} files"
+    file_info = files[0]
+    if not isinstance(file_info, dict):
+        return "Edited files"
+    raw_path = file_info.get("path")
+    name = Path(str(raw_path)).name if raw_path else "file"
+    status = file_info.get("status")
+    if status == "added":
+        return f"Added {name}"
+    if status == "deleted":
+        return f"Deleted {name}"
+    return f"Edited {name}"
 def tool_failure_content(result: object) -> str:
     stdout = str(getattr(result, "stdout", "") or "").strip()
     stderr = str(getattr(result, "stderr", "") or "").strip()

package/backend/tests/__pycache__/conftest.cpython-313-pytest-9.0.3.pyc CHANGED Viewed

Binary file

package/backend/tests/__pycache__/test_agent_tools.cpython-313-pytest-9.0.3.pyc CHANGED Viewed

Binary file

package/backend/tests/__pycache__/test_channels.cpython-313-pytest-9.0.3.pyc ADDED Viewed

Binary file

package/backend/tests/__pycache__/test_health.cpython-313-pytest-9.0.3.pyc CHANGED Viewed

Binary file

package/backend/tests/__pycache__/test_llm_providers.cpython-313-pytest-9.0.3.pyc CHANGED Viewed

Binary file

package/backend/tests/__pycache__/test_logging.cpython-313-pytest-9.0.3.pyc CHANGED Viewed

Binary file

package/backend/tests/__pycache__/test_persistence.cpython-313-pytest-9.0.3.pyc CHANGED Viewed

Binary file

package/backend/tests/__pycache__/test_startup_requirements.cpython-313-pytest-9.0.3.pyc CHANGED Viewed

Binary file

package/backend/tests/__pycache__/test_workspace_chat.cpython-313-pytest-9.0.3.pyc CHANGED Viewed

Binary file

package/backend/tests/test_agent_tools.py CHANGED Viewed

@@ -253,9 +253,60 @@ def test_apply_patch_modifies_workdir_file(tmp_path) -> None:
     result = run_tool("apply_patch", {"patch": patch}, ToolContext(cwd=tmp_path))
     assert result.ok
+    assert result.title == "Edited notes.txt"
     assert target.read_text() == "alpha\nready\n"
+def test_apply_patch_added_file_title(tmp_path) -> None:
+    patch = """*** Begin Patch
+*** Add File: created.txt
++hello
+*** End Patch
+"""
+    result = run_tool("apply_patch", {"patch": patch}, ToolContext(cwd=tmp_path))
+    assert result.ok
+    assert result.title == "Added created.txt"
+    assert (tmp_path / "created.txt").read_text() == "hello\n"
+def test_apply_patch_deleted_file_title(tmp_path) -> None:
+    target = tmp_path / "old.txt"
+    target.write_text("remove me\n")
+    patch = """*** Begin Patch
+*** Delete File: old.txt
+*** End Patch
+"""
+    result = run_tool("apply_patch", {"patch": patch}, ToolContext(cwd=tmp_path))
+    assert result.ok
+    assert result.title == "Deleted old.txt"
+    assert not target.exists()
+def test_apply_patch_multiple_files_title(tmp_path) -> None:
+    target = tmp_path / "notes.txt"
+    target.write_text("alpha\nbeta\n")
+    patch = """*** Begin Patch
+*** Update File: notes.txt
+@@
+-beta
++ready
+*** Add File: created.txt
++hello
+*** End Patch
+"""
+    result = run_tool("apply_patch", {"patch": patch}, ToolContext(cwd=tmp_path))
+    assert result.ok
+    assert result.title == "Edited 2 files"
+    assert target.read_text() == "alpha\nready\n"
+    assert (tmp_path / "created.txt").read_text() == "hello\n"
 def test_apply_patch_rejects_outside_workdir_file(tmp_path) -> None:
     outside = Path(__file__).resolve().parent / "outside-patch.txt"
     outside.write_text("alpha\n")
@@ -271,6 +322,7 @@ def test_apply_patch_rejects_outside_workdir_file(tmp_path) -> None:
         result = run_tool("apply_patch", {"patch": patch}, ToolContext(cwd=tmp_path))
         assert not result.ok
+        assert result.title == "Edit failed"
         assert outside.read_text() == "alpha\n"
     finally:
         outside.unlink(missing_ok=True)
@@ -297,6 +349,7 @@ def test_apply_patch_uses_internal_subcommand(tmp_path, monkeypatch) -> None:
     result = run_tool("apply_patch", {"patch": patch}, ToolContext(cwd=tmp_path))
     assert result.ok
+    assert result.title == "Edited files"
     assert calls
     assert calls[0][1:4] == ["-m", "flowent.cli", "apply-patch"]
@@ -326,6 +379,7 @@ def test_apply_patch_reports_patch_error_when_stderr_has_warning(
     result = run_tool("apply_patch", {"patch": patch}, ToolContext(cwd=tmp_path))
     assert not result.ok
+    assert result.title == "Edit failed"
     assert result.content == "Patch context was not found."