meshagent-cli 0.47.0__tar.gz → 0.48.0__tar.gz

{meshagent_cli-0.47.0 → meshagent_cli-0.48.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.47.0
+Version: 0.48.0
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -22,8 +22,8 @@ Requires-Dist: openpyxl~=3.1
 Requires-Dist: xlsxwriter~=3.2
 Requires-Dist: pathspec<2,>=1.0.3
 Requires-Dist: zstandard~=0.25.0
-Requires-Dist: meshagent-llm-proxy==0.47.0
-Requires-Dist: meshagent-codex==0.47.0
+Requires-Dist: meshagent-llm-proxy==0.48.0
+Requires-Dist: meshagent-codex==0.48.0
 Requires-Dist: rich~=14.3.0
 Requires-Dist: sounddevice~=0.5
 Requires-Dist: textual<9.0,>=8.2.3
@@ -32,23 +32,23 @@ Requires-Dist: prompt-toolkit~=3.0.52
 Requires-Dist: ascii-magic~=2.3
 Requires-Dist: pillow~=11.3.0
 Provides-Extra: all
-Requires-Dist: meshagent-agents[all]==0.47.0; extra == "all"
-Requires-Dist: meshagent-api[all]==0.47.0; extra == "all"
-Requires-Dist: meshagent-commoncrawl==0.47.0; extra == "all"
-Requires-Dist: meshagent-scrapy==0.47.0; extra == "all"
-Requires-Dist: meshagent-computers==0.47.0; extra == "all"
-Requires-Dist: meshagent-openai==0.47.0; extra == "all"
-Requires-Dist: meshagent-anthropic==0.47.0; extra == "all"
-Requires-Dist: meshagent-otel==0.47.0; extra == "all"
-Requires-Dist: meshagent-mcp==0.47.0; extra == "all"
-Requires-Dist: meshagent-tools==0.47.0; extra == "all"
+Requires-Dist: meshagent-agents[all]==0.48.0; extra == "all"
+Requires-Dist: meshagent-api[all]==0.48.0; extra == "all"
+Requires-Dist: meshagent-commoncrawl==0.48.0; extra == "all"
+Requires-Dist: meshagent-scrapy==0.48.0; extra == "all"
+Requires-Dist: meshagent-computers==0.48.0; extra == "all"
+Requires-Dist: meshagent-openai==0.48.0; extra == "all"
+Requires-Dist: meshagent-anthropic==0.48.0; extra == "all"
+Requires-Dist: meshagent-otel==0.48.0; extra == "all"
+Requires-Dist: meshagent-mcp==0.48.0; extra == "all"
+Requires-Dist: meshagent-tools==0.48.0; extra == "all"
 Requires-Dist: supabase-auth~=2.28.0; extra == "all"
 Requires-Dist: prompt-toolkit~=3.0.52; extra == "all"
 Provides-Extra: mcp-service
-Requires-Dist: meshagent-agents[all]==0.47.0; extra == "mcp-service"
-Requires-Dist: meshagent-api==0.47.0; extra == "mcp-service"
-Requires-Dist: meshagent-mcp==0.47.0; extra == "mcp-service"
-Requires-Dist: meshagent-tools==0.47.0; extra == "mcp-service"
+Requires-Dist: meshagent-agents[all]==0.48.0; extra == "mcp-service"
+Requires-Dist: meshagent-api==0.48.0; extra == "mcp-service"
+Requires-Dist: meshagent-mcp==0.48.0; extra == "mcp-service"
+Requires-Dist: meshagent-tools==0.48.0; extra == "mcp-service"
 Requires-Dist: supabase-auth~=2.28.0; extra == "mcp-service"
 Dynamic: license-file
 

{meshagent_cli-0.47.0 → meshagent_cli-0.48.0}/meshagent/cli/ask.py

@@ -137,6 +137,7 @@ from meshagent.agents.process import (
     TurnInstructionsProvider,
 )
 from meshagent.api import Participant, RoomException
+from meshagent.api.messaging import Content
 from meshagent.cli import async_typer, auth_async
 from meshagent.cli._filedrop import (
     dropped_file_paths_from_text,
@@ -348,6 +349,7 @@ def _format_ask_tool_call_entry_text(
     toolkit: str,
     tool: str,
     arguments: dict[str, Any] | None,
+    result: Content | dict[str, object] | None = None,
     logs: list[str],
     error_message: str | None,
     completed: bool = True,
@@ -357,6 +359,7 @@ def _format_ask_tool_call_entry_text(
         toolkit=toolkit,
         tool=tool,
         arguments=arguments,
+        result=result,
         failed=failed,
         completed=completed,
     )
@@ -4701,6 +4704,7 @@ async def _run_ask_tui(
                 toolkit=toolkit,
                 tool=tool,
                 arguments=arguments,
+                result=message.result,
                 logs=logs,
                 error_message=error_message,
             )

{meshagent_cli-0.47.0 → meshagent_cli-0.48.0}/meshagent/cli/cli.py

@@ -180,6 +180,11 @@ app.add_lazy_command(
     module="meshagent.cli.rooms",
     help="Create, list, and manage rooms in a project",
 )
+app.add_lazy_command(
+    name="volumes",
+    module="meshagent.cli.volumes",
+    help="Manage durable storage volumes for a room",
+)
 app.add_lazy_command(
     name="agent",
     module="meshagent.cli.agents",
@@ -376,8 +381,12 @@ SHELL_RENDERERS = {
 }
 
 
-if __name__ == "__main__":
+def main() -> None:
     from meshagent.agents.channel_process import dispatch_main
 
     if not dispatch_main(executable_name=Path(sys.argv[0]).name, argv=sys.argv[1:]):
-        app()
+        raise SystemExit(app())
+
+
+if __name__ == "__main__":
+    main()

{meshagent_cli-0.47.0 → meshagent_cli-0.48.0}/meshagent/cli/cli_test.py

@@ -5,6 +5,7 @@ import types
 import pytest
 
 from meshagent.api import RoomException
+from meshagent.agents import channel_process
 from meshagent.cli import async_typer
 from meshagent.cli import cli
 from meshagent.cli.testing import CliRunner
@@ -57,6 +58,7 @@ def test_root_help_lists_create_and_doctor_but_hides_legacy_command_namespaces()
     assert "│ api-key" not in result.output
     assert "│ launch" in result.output
     assert "│ room" in result.output
+    assert "│ volumes" in result.output
     assert "│ call" not in result.output
     assert "│ package" not in result.output
     assert "│ multi" not in result.output
@@ -132,6 +134,17 @@ def test_app_prints_room_exception_without_traceback(capsys) -> None:
     assert captured.out == ""
 
 
+def test_main_exits_with_status_returned_by_async_typer(monkeypatch) -> None:
+    monkeypatch.setattr(channel_process, "dispatch_main", lambda **kwargs: False)
+    monkeypatch.setattr(cli, "app", lambda: 23)
+    monkeypatch.setattr(sys, "argv", ["meshagent", "build"])
+
+    with pytest.raises(SystemExit) as exc_info:
+        cli.main()
+
+    assert exc_info.value.code == 23
+
+
 def test_room_help_lists_agents_command() -> None:
     result = CliRunner().invoke(cli.app, ["room", "--help"])
 
@@ -139,6 +152,36 @@ def test_room_help_lists_agents_command() -> None:
     assert "│ agents" in result.output
 
 
+def test_volumes_help_lists_durable_lifecycle_commands() -> None:
+    result = CliRunner().invoke(cli.app, ["volumes", "--help"])
+
+    assert result.exit_code == 0
+    assert "│ list" in result.output
+    assert "│ create" in result.output
+    assert "│ expand" in result.output
+    assert "│ delete" in result.output
+    assert "lease" not in result.output.lower()
+
+    create_result = CliRunner().invoke(cli.app, ["volumes", "create", "--help"])
+    assert create_result.exit_code == 0
+    assert "--type" in create_result.output
+    assert "--max-size" in create_result.output
+
+    expand_result = CliRunner().invoke(cli.app, ["volumes", "expand", "--help"])
+    assert expand_result.exit_code == 0
+    assert "--max-size" in expand_result.output
+
+
+def test_room_mounts_help_is_list_only() -> None:
+    result = CliRunner().invoke(cli.app, ["room", "mounts", "--help"])
+
+    assert result.exit_code == 0
+    assert "│ list" in result.output
+    assert "│ mount" not in result.output
+    assert "│ unmount" not in result.output
+    assert "lease" not in result.output.lower()
+
+
 def test_room_agents_help_lists_call_command() -> None:
     result = CliRunner().invoke(cli.app, ["room", "agents", "--help"])
 

{meshagent_cli-0.47.0 → meshagent_cli-0.48.0}/meshagent/cli/create.py

@@ -17,46 +17,6 @@ from meshagent.cli.meshagent_images import render_meshagent_image_prefix_templat
 from meshagent.cli.version import __version__ as MESHAGENT_CLIENT_VERSION
 
 
-SOURCE_SUFFIXES = {
-    ".cs",
-    ".dart",
-    ".go",
-    ".js",
-    ".jsx",
-    ".py",
-    ".rb",
-    ".ts",
-    ".tsx",
-}
-PROJECT_MARKER_NAMES = {
-    "Containerfile",
-    "Dockerfile",
-    "Gemfile",
-    "go.mod",
-    "meshagent.yaml",
-    "meshagent.yml",
-    "package.json",
-    "pubspec.yaml",
-    "pyproject.toml",
-    "requirements.txt",
-    "tsconfig.json",
-}
-IGNORED_DIR_NAMES = {
-    ".git",
-    ".venv",
-    "__pycache__",
-    "build",
-    "dist",
-    "node_modules",
-    "obj",
-    "target",
-    "venv",
-}
-IGNORED_FILE_NAMES = {
-    ".DS_Store",
-    ".gitkeep",
-}
-
 WEB_FOCUS = "webserver"
 AGENT_FOCUS = "backend-agent"
 CHATBOT_FOCUS = "chatbot"
@@ -637,23 +597,8 @@ FOCUS_ALIASES = {
 }
 
 
-def _has_existing_project_content(root: Path) -> bool:
-    for path in sorted(root.rglob("*")):
-        try:
-            relative_parts = path.relative_to(root).parts
-        except ValueError:
-            continue
-        if any(part in IGNORED_DIR_NAMES for part in relative_parts[:-1]):
-            continue
-        if path.is_dir():
-            continue
-        if path.name in IGNORED_FILE_NAMES:
-            continue
-        if path.name in PROJECT_MARKER_NAMES:
-            return True
-        if path.suffix.lower() in SOURCE_SUFFIXES:
-            return True
-    return False
+def _target_directory_is_nonempty(root: Path) -> bool:
+    return next(root.iterdir(), None) is not None
 
 
 def _read_create_template(template_name: str) -> str:
@@ -1153,7 +1098,7 @@ def _create_command(
             "--no-interactive when running from a script."
         )
 
-    if _has_existing_project_content(root):
+    if _target_directory_is_nonempty(root):
         if interactive is not False and is_interactive_stdio:
             existing_project_selection = _run_existing_project_tui(root=root)
             if existing_project_selection is None:
@@ -1169,7 +1114,9 @@ def _create_command(
             typer.echo(f"New project: {root}")
         else:
             typer.echo("")
-            typer.echo("Existing application code or deployment metadata was detected.")
+            typer.echo(
+                "The target directory is not empty; treating it as an existing project."
+            )
             typer.echo("No files were written.")
             typer.echo("")
             typer.echo("Recommended next step for existing projects:")

{meshagent_cli-0.47.0 → meshagent_cli-0.48.0}/meshagent/cli/create_project_templates/python/contact-form/server.py

@@ -25,7 +25,8 @@ logging.basicConfig(
 )
 LOGGER = logging.getLogger("contact_form")
 
-DEFAULT_FROM_ADDRESS = "contact@mail.meshagent.com"
+DEFAULT_MAIL_DOMAIN = "mail.meshagent.com"
+DEFAULT_FROM_ADDRESS = f"contact@{DEFAULT_MAIL_DOMAIN}"
 DEFAULT_TO_ADDRESS = ""
 PRIVATE_MAILBOX_PERMISSION_ERROR = "5.7.1 Permission denied"
 TRUE_ENV_VALUES = {"1", "true", "yes", "on"}
@@ -181,10 +182,19 @@ def room_slug_from_name(room_name: str) -> str:
     return room_slug or "room"
 
 
+def mail_domain() -> str:
+    return (
+        os.getenv("MESHAGENT_MAIL_DOMAIN", DEFAULT_MAIL_DOMAIN)
+        .strip()
+        .removeprefix("@")
+        or DEFAULT_MAIL_DOMAIN
+    )
+
+
 def default_from_address() -> str:
     room_name = os.getenv("MESHAGENT_ROOM", "").strip()
     if room_name:
-        return f"contact-{room_slug_from_name(room_name)}@mail.meshagent.com"
+        return f"contact-{room_slug_from_name(room_name)}@{mail_domain()}"
     return DEFAULT_FROM_ADDRESS
 
 

{meshagent_cli-0.47.0 → meshagent_cli-0.48.0}/meshagent/cli/create_test.py

@@ -295,8 +295,6 @@ def test_static_nginx_create_templates_mount_writable_data_dir() -> None:
 
 
 def test_init_creates_python_backend_agent_by_default_in_non_tty(tmp_path) -> None:
-    (tmp_path / ".gitkeep").write_text("", encoding="utf-8")
-
     result = CliRunner().invoke(create_command, [str(tmp_path)])
     diagnosis = diagnose_project(tmp_path)
 
@@ -4363,8 +4361,8 @@ def test_init_interactive_requires_tty_when_language_missing(tmp_path) -> None:
     assert not (tmp_path / "Dockerfile").exists()
 
 
-def test_init_recommends_doctor_for_existing_code(tmp_path) -> None:
-    (tmp_path / "server.py").write_text("print('already here')\n", encoding="utf-8")
+def test_init_treats_any_nonempty_target_as_an_existing_project(tmp_path) -> None:
+    (tmp_path / ".gitkeep").write_text("", encoding="utf-8")
 
     result = CliRunner().invoke(
         create_command,
@@ -4380,7 +4378,7 @@ def test_init_recommends_doctor_for_existing_code(tmp_path) -> None:
 
     assert result.exit_code == 0
     assert "meshagent create" in result.output
-    assert "Existing application code" in result.output
+    assert "target directory is not empty" in result.output
     assert "No files were written" in result.output
     assert "meshagent doctor" in result.output
     assert not (tmp_path / "Dockerfile").exists()

{meshagent_cli-0.47.0 → meshagent_cli-0.48.0}/meshagent/cli/image.py

@@ -175,7 +175,7 @@ _DEPLOY_DOCKERFILE_HAPPY_PATH = (
 _DEPLOY_MISSING_DOCKERFILE_GUIDANCE = (
     "If PATH does not include a Dockerfile yet, create a minimal Dockerfile in "
     "the app directory first or create one elsewhere in PATH and pass it with "
-    "--dockerfile-path."
+    "--file."
 )
 
 
@@ -521,6 +521,41 @@ def _resolve_build_context_path(
     return mount_path
 
 
+def _dockerfile_path_from_file_option(
+    *,
+    pack_spec: _BuildPackSpec,
+    file_path: str,
+) -> str:
+    relative_path = PurePosixPath(file_path)
+    if relative_path.is_absolute():
+        raise typer.BadParameter("--file must be relative to PATH")
+    if len(relative_path.parts) == 0 or relative_path == PurePosixPath("."):
+        raise typer.BadParameter("--file cannot be empty")
+    if ".." in relative_path.parts:
+        raise typer.BadParameter("--file must stay inside PATH")
+    return posixpath.join(pack_spec.mount_path, relative_path.as_posix())
+
+
+def _warn_legacy_build_path_options(
+    *,
+    context_path: str | None,
+    dockerfile_path: str | None,
+) -> None:
+    if context_path is not None:
+        typer.echo(
+            "Warning: --context-path is deprecated; pass the selected build "
+            "context directory as PATH instead.",
+            err=True,
+        )
+    if dockerfile_path is not None:
+        typer.echo(
+            "Warning: --dockerfile-path/--docker-file-path is deprecated; use "
+            "--file with a path relative to PATH instead (for example, "
+            "--file refresher/Dockerfile).",
+            err=True,
+        )
+
+
 def _parse_build_tag(tag: str) -> _ParsedImageTag:
     cleaned = tag.strip()
     if cleaned == "":
@@ -1046,17 +1081,28 @@ def _resolve_build_stage_inputs(
     context_path: str | None,
     dockerfile_path: str | None,
     pack: str,
+    file_path: str | None = None,
 ) -> _ResolvedBuildStageInputs:
     pack_spec = _parse_build_pack(pack)
+    if file_path is not None and dockerfile_path is not None:
+        raise typer.BadParameter(
+            "--file cannot be combined with --dockerfile-path/--docker-file-path"
+        )
     resolved_context_path = _resolve_build_context_path(
         context_path=context_path,
         mount_path=pack_spec.mount_path,
     )
-    dockerfile_path = _infer_packed_dockerfile_path(
-        pack_spec=pack_spec,
-        context_path=resolved_context_path,
-        dockerfile_path=dockerfile_path,
-    )
+    if file_path is not None:
+        dockerfile_path = _dockerfile_path_from_file_option(
+            pack_spec=pack_spec,
+            file_path=file_path,
+        )
+    else:
+        dockerfile_path = _infer_packed_dockerfile_path(
+            pack_spec=pack_spec,
+            context_path=resolved_context_path,
+            dockerfile_path=dockerfile_path,
+        )
 
     local_packed_dockerfile = _resolve_local_packed_dockerfile(
         pack_spec=pack_spec,
@@ -3688,6 +3734,19 @@ def _print_service_exited_before_live(
     )
 
 
+def _is_transient_room_disconnect(error: RoomException) -> bool:
+    message = str(error).lower()
+    return any(
+        marker in message
+        for marker in (
+            "room connection is disconnected",
+            "room connection unexpectedly closed",
+            "websocket closed with code 1006",
+            "cannot write to closing transport",
+        )
+    )
+
+
 async def _wait_for_deployed_service_live(
     *,
     client: RoomClient,
@@ -3701,6 +3760,7 @@ async def _wait_for_deployed_service_live(
     log_handler: Callable[[str], Awaitable[None]] | None = None,
 ) -> None:
     active_logs: _ActiveDeployLogStream | None = None
+    connection_retry_reported = False
 
     await _emit_deploy_status(
         status_handler,
@@ -3728,9 +3788,29 @@ async def _wait_for_deployed_service_live(
 
     try:
         while True:
-            state = await _get_service_runtime_state(
-                client=client, service_id=service_id
-            )
+            try:
+                state = await _get_service_runtime_state(
+                    client=client, service_id=service_id
+                )
+            except RoomException as error:
+                if not _is_transient_room_disconnect(error):
+                    raise
+                if not connection_retry_reported:
+                    await _emit_deploy_status(
+                        status_handler,
+                        rich_message=(
+                            "[yellow]Room connection interrupted while confirming "
+                            "service readiness; retrying...[/]"
+                        ),
+                        plain_message=(
+                            "Room connection interrupted while confirming service "
+                            "readiness; retrying..."
+                        ),
+                    )
+                    connection_retry_reported = True
+                await asyncio.sleep(_DEPLOY_WAIT_POLL_INTERVAL_SECONDS)
+                continue
+            connection_retry_reported = False
             if state is None:
                 await asyncio.sleep(_DEPLOY_WAIT_POLL_INTERVAL_SECONDS)
                 continue
@@ -3989,6 +4069,7 @@ async def _run_image_build_stage(
     private: bool,
     optimize: bool,
     cred: list[str],
+    file_path: str | None = None,
     add_latest_tag: bool = False,
     status_handler: Callable[[str], Awaitable[None]] | None = None,
     log_handler: Callable[[str], Awaitable[None]] | None = None,
@@ -3998,6 +4079,7 @@ async def _run_image_build_stage(
         context_path=context_path,
         dockerfile_path=dockerfile_path,
         pack=pack,
+        file_path=file_path,
     )
 
     account_client, client = await _with_client(
@@ -4129,6 +4211,7 @@ def _validate_deploy_build_stage_options(
     optimize: bool,
     cred: list[str],
     add_latest_tag: bool,
+    file_path: str | None = None,
 ) -> None:
     if pack is not None:
         return
@@ -4138,6 +4221,8 @@ def _validate_deploy_build_stage_options(
         invalid_options.append("--context-path")
     if dockerfile_path is not None:
         invalid_options.append("--dockerfile-path")
+    if file_path is not None:
+        invalid_options.append("--file")
     if builder_name is not None:
         invalid_options.append("--builder-name")
     if not optimize:
@@ -4170,16 +4255,15 @@ async def build_image(
         typer.Argument(
             ...,
             metavar="PATH",
-            help=(
-                "Local directory to stream as the build context. Format "
-                "'<path>[:<mount>]'. Defaults mount to /context."
-            ),
+            help=("Local directory to use as the Docker build context."),
         ),
     ],
     tag: Annotated[
         str,
         typer.Option(
             ...,
+            "-t",
+            "--tag",
             help=(
                 "Image tag to build. Supports <repository>:<tag>, "
                 "<project-key>/<repository>:<tag>, or "
@@ -4188,24 +4272,27 @@ async def build_image(
             ),
         ),
     ],
+    file_path: Annotated[
+        Optional[str],
+        typer.Option(
+            "-f",
+            "--file",
+            help="Dockerfile path relative to PATH.",
+        ),
+    ] = None,
     context_path: Annotated[
         Optional[str],
         typer.Option(
             "--context-path",
-            help=(
-                "Build context path inside the streamed build context (absolute "
-                "path). Defaults to the PATH mount path."
-            ),
+            hidden=True,
         ),
     ] = None,
     dockerfile_path: Annotated[
         Optional[str],
         typer.Option(
             "--dockerfile-path",
-            help=(
-                "Optional Dockerfile path inside the streamed build context "
-                "(absolute path)."
-            ),
+            "--docker-file-path",
+            hidden=True,
         ),
     ] = None,
     builder_name: Annotated[
@@ -4247,6 +4334,10 @@ async def build_image(
         ),
     ] = False,
 ) -> None:
+    _warn_legacy_build_path_options(
+        context_path=context_path,
+        dockerfile_path=dockerfile_path,
+    )
     parsed_tag = _parse_build_tag(tag)
     resolved_room = resolve_room(room)
     if resolved_room is None:
@@ -4273,6 +4364,7 @@ async def build_image(
         private=private,
         optimize=optimize,
         cred=cred,
+        file_path=file_path,
         add_latest_tag=latest,
     )
 
@@ -4350,17 +4442,15 @@ async def deploy_image(
         Optional[str],
         typer.Argument(
             metavar="PATH",
-            help=(
-                "Local directory to stream as the build context before deploy. "
-                "Format '<path>[:<mount>]'. Defaults mount to /context. PATH is "
-                "typically the app directory you want to deploy."
-            ),
+            help=("Local directory to use as the Docker build context before deploy."),
         ),
     ] = None,
     tag: Annotated[
         str,
         typer.Option(
             ...,
+            "-t",
+            "--tag",
             help=(
                 "Image tag to deploy, e.g. repo/name:tag. When used with PATH, "
                 "shorthand <repository>:<tag> and "
@@ -4369,26 +4459,27 @@ async def deploy_image(
             ),
         ),
     ],
+    file_path: Annotated[
+        Optional[str],
+        typer.Option(
+            "-f",
+            "--file",
+            help="Dockerfile path relative to PATH. Only used with PATH.",
+        ),
+    ] = None,
     context_path: Annotated[
         Optional[str],
         typer.Option(
             "--context-path",
-            help=(
-                "Build context path inside the packed build context (absolute path). "
-                "Only used with PATH."
-            ),
+            hidden=True,
         ),
     ] = None,
     dockerfile_path: Annotated[
         Optional[str],
         typer.Option(
             "--dockerfile-path",
-            help=(
-                "Optional Dockerfile path inside the packed build context (absolute "
-                "path). Only used with PATH. Use this when the app directory has "
-                "no top-level Dockerfile or when you create the Dockerfile under "
-                "a different path."
-            ),
+            "--docker-file-path",
+            hidden=True,
         ),
     ] = None,
     optimize: Annotated[
@@ -4453,7 +4544,6 @@ async def deploy_image(
         list[str],
         typer.Option(
             "--values",
-            "-f",
             help=(
                 "YAML file containing deploy template values. Can be passed "
                 "multiple times; later files override earlier files."
@@ -4605,6 +4695,10 @@ async def deploy_image(
     ] = True,
 ) -> None:
     """Create or update a room service from an image."""
+    _warn_legacy_build_path_options(
+        context_path=context_path,
+        dockerfile_path=dockerfile_path,
+    )
     parsed_tag = _parse_build_tag(tag)
     project_registry: str | None = None
     _validate_deploy_build_stage_options(
@@ -4615,6 +4709,7 @@ async def deploy_image(
         optimize=optimize,
         cred=cred,
         add_latest_tag=latest,
+        file_path=file_path,
     )
     parsed_environment = _parse_environment_variables(values=env)
     parsed_secret_environment = _parse_environment_secret_variables(values=env_secret)
@@ -4672,6 +4767,7 @@ async def deploy_image(
             context_path=context_path,
             dockerfile_path=dockerfile_path,
             pack=pack,
+            file_path=file_path,
         )
         packed_dockerfile_metadata = _parse_packed_dockerfile_metadata(
             local_packed_dockerfile=build_inputs.local_packed_dockerfile
@@ -4964,6 +5060,7 @@ async def deploy_image(
                         private=False,
                         optimize=optimize,
                         cred=cred,
+                        file_path=file_path,
                         add_latest_tag=latest,
                         status_handler=status_handler,
                         log_handler=log_handler,